diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index b33149803..6982b120a 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3990,7 +3990,9 @@ void SV_StopServer(void)
 		Y_EndIntermission();
 	if (gamestate == GS_VOTING)
 		Y_EndVote();
-	gamestate = wipegamestate = GS_NULL;
+
+	G_SetGamestate(GS_NULL);
+	wipegamestate = GS_NULL;
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 		((UINT16*)localtextcmd[i])[0] = 0;