diff --git a/src/d_main.cpp b/src/d_main.cpp
index 98590c30a..ad80439d9 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -1251,6 +1251,8 @@ void D_ClearState(void)
 
 	G_SetGamestate(GS_NULL);
 	wipegamestate = GS_NULL;
+
+	demo.waitingfortally = false;
 }
 
 static boolean g_deferredtitle = false;
diff --git a/src/g_demo.cpp b/src/g_demo.cpp
index 7e5ceafbf..c56e7a8e6 100644
--- a/src/g_demo.cpp
+++ b/src/g_demo.cpp
@@ -3397,8 +3397,6 @@ void G_AddGhost(savebuffer_t *buffer, const char *defdemoname)
 
 	p = buffer->buffer;
 
-	demo.waitingfortally = false;
-
 	// read demo header
 	if (memcmp(p, DEMOHEADER, 12))
 	{