diff --git a/src/g_game.c b/src/g_game.c
index ced20e5b..40475c02 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4614,6 +4614,13 @@ void G_ReadDemoExtraData(void)
 
 		p = READUINT8(demo_p);
 	}
+
+	if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_CheckDemoStatus();
+		return;
+	}
 }
 
 void G_WriteDemoExtraData(void)