diff --git a/src/g_demo.c b/src/g_demo.c
index 158e05adf0d7bc57d24e1cd451bcaf42391a7f49..54b12f797b4c2bb9bc901c1b0eb51e51cba0fd85 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -549,7 +549,7 @@ void G_ConsGhostTic(void)
 
 	testmo = players[0].mo;
 
-	if (!testmo)
+	if (P_MobjWasRemoved(testmo))
 		return; // No valid mobj exists, probably because of unexpected quit
 
 	// Grab ghost data.