diff --git a/Quake/host.c b/Quake/host.c
index 2b884693..07cf641c 100644
--- a/Quake/host.c
+++ b/Quake/host.c
@@ -133,7 +133,7 @@ void Host_EndGame (const char *message, ...)
 	if (cls.state == ca_dedicated)
 		Sys_Error ("Host_EndGame: %s\n",string);	// dedicated servers exit
 
-	if (cls.demonum != -1)
+	if (cls.demonum != -1 && !cls.timedemo)
 		CL_NextDemo ();
 	else
 		CL_Disconnect ();
@@ -943,4 +943,3 @@ void Host_Shutdown(void)
 
 	LOC_Shutdown ();
 }
-