diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 33802170e..041dff59d 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -6972,6 +6972,12 @@ boolean TryRunTics(tic_t realtics)
 					dontRun = false;
 				}
 
+				if ((gamestate == GS_LEVEL) && (!(addedtogame || dedicated)))
+				{
+					// Prevent race conditions by not running game ticks if we're not added to the game yet
+					dontRun = true;
+				}
+
 				if (dontRun == false)
 				{
 					if (levelloading == true)