diff --git a/src/game/lv.c b/src/game/lv.c
index 5d8025a51..4b6614847 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -2246,6 +2246,9 @@ void lvTick(void)
 
 			if (elapsed < TICKS(g_MpTimeLimit60) && nexttime >= TICKS(g_MpTimeLimit60)) {
 				// Match is ending due to time limit reached
+#ifndef PLATFORM_N64
+				if (g_NetMode != NETMODE_CLIENT)
+#endif
 				mainEndStage();
 			}
 
@@ -2299,6 +2302,12 @@ void lvTick(void)
 				}
 			}
 
+#ifndef PLATFORM_N64
+			if (g_NetMode == NETMODE_CLIENT) {
+				g_NumReasonsToEndMpMatch = 0;
+			}
+#endif
+
 			if (g_NumReasonsToEndMpMatch > 0 && numdying == 0) {
 				mainEndStage();
 			}