diff --git a/src/g_demo.c b/src/g_demo.c
index 90959dc20..95f5a0ac3 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -4182,7 +4182,10 @@ boolean G_CheckDemoStatus(void)
 
 	if (modeattacking || demo.savemode != DSM_NOTSAVING)
 	{
-		G_SaveDemo();
+		if (demobuf.p)
+		{
+			G_SaveDemo();
+		}
 		return true;
 	}