diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f3b2fc391..e2e3da806 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2081,8 +2081,9 @@ static void CL_ConnectToServer(void)
 		Y_EndVote();
 
 	DEBFILE(va("waiting %d nodes\n", doomcom->numnodes));
-	M_ClearMenus(true);
 	G_SetGamestate(GS_WAITINGPLAYERS);
+	if (wipegamestate == GS_MENU)
+		M_ClearMenus(true);
 	wipegamestate = GS_WAITINGPLAYERS;
 
 	ClearAdminPlayers();
diff --git a/src/g_game.c b/src/g_game.c
index dc7c905e9..827cd2966 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4816,7 +4816,6 @@ cleanup:
 void G_DeferedInitNew(boolean pencoremode, INT32 map, INT32 pickedchar, UINT8 ssplayers, boolean FLS)
 {
 	UINT16 color = SKINCOLOR_NONE;
-	INT32 dogametype;
 
 	paused = false;
 
@@ -4827,17 +4826,8 @@ void G_DeferedInitNew(boolean pencoremode, INT32 map, INT32 pickedchar, UINT8 ss
 
 	G_ResetRandMapBuffer();
 
-	if ((modeattacking == ATTACKING_CAPSULES) || (bossinfo.boss == true))
-	{
-		dogametype = GT_BATTLE;
-	}
-	else
-	{
-		dogametype = GT_RACE;
-	}
-
 	// this leave the actual game if needed
-	SV_StartSinglePlayerServer(dogametype, false);
+	SV_StartSinglePlayerServer(gametype, false);
 
 	if (splitscreen != ssplayers)
 	{