diff --git a/src/g_game.c b/src/g_game.c
index 490b55bd..6dca67fb 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5402,6 +5402,13 @@ void G_ConsAllGhostTics(void)
 		G_ConsGhostTic(p);
 		p = READUINT8(demo_p);
 	}
+
+	if (*demo_p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_CheckDemoStatus();
+		return;
+	}
 }
 
 // Uses ghost data to do consistency checks on your position.