diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 84fcb5d4b..e6e6987e3 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -5488,14 +5488,6 @@ boolean TryRunTics(tic_t realtics)
 
 	if (ticking)
 	{
-		if (advancedemo)
-		{
-			if (timedemo_quit)
-				COM_ImmedExecute("quit");
-			else
-				D_StartTitle();
-		}
-		else
 		{
 			// run the count * tics
 			while (neededtic > gametic)
diff --git a/src/d_main.c b/src/d_main.c
index 7f1a40ca6..330290fe2 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -131,7 +131,6 @@ INT32 postimgparam[MAXSPLITSCREENPLAYERS];
 boolean sound_disabled = false;
 boolean digital_disabled = false;
 
-boolean advancedemo;
 #ifdef DEBUGFILE
 INT32 debugload = 0;
 #endif
@@ -913,15 +912,6 @@ void D_SRB2Loop(void)
 	}
 }
 
-//
-// D_AdvanceDemo
-// Called after each demo or intro demosequence finishes
-//
-void D_AdvanceDemo(void)
-{
-	advancedemo = true;
-}
-
 // =========================================================================
 // D_SRB2Main
 // =========================================================================
@@ -997,7 +987,6 @@ void D_StartTitle(void)
 	//demosequence = -1;
 	G_SetGametype(GT_RACE); // SRB2kart
 	paused = false;
-	advancedemo = false;
 	F_StartTitleScreen();
 
 	// Reset the palette
diff --git a/src/d_main.h b/src/d_main.h
index f01f9227f..c8e803521 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -18,8 +18,6 @@
 #include "d_event.h"
 #include "w_wad.h"   // for MAX_WADFILES
 
-extern boolean advancedemo;
-
 // make sure not to write back the config until it's been correctly loaded
 extern tic_t rendergametic;
 
@@ -52,7 +50,6 @@ const char *D_Home(void);
 //
 // BASE LEVEL
 //
-void D_AdvanceDemo(void);
 void D_StartTitle(void);
 
 #endif //__D_MAIN__
diff --git a/src/g_demo.c b/src/g_demo.c
index f7282e263..0fbd920c6 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -3727,7 +3727,11 @@ static void G_StopTimingDemo(void)
 
 	if (restorecv_vidwait != cv_vidwait.value)
 		CV_SetValue(&cv_vidwait, restorecv_vidwait);
-	D_AdvanceDemo();
+
+	if (timedemo_quit)
+		COM_ImmedExecute("quit");
+	else
+		D_StartTitle();
 }
 
 // reset engine variable set for the demos
@@ -3786,10 +3790,12 @@ boolean G_CheckDemoStatus(void)
 		{
 			G_StopDemo();
 
-			if (modeattacking)
+			if (timedemo_quit)
+				COM_ImmedExecute("quit");
+			else if (modeattacking)
 				M_EndModeAttackRun();
 			else
-				D_AdvanceDemo();
+				D_StartTitle();
 		}
 
 		return true;