diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 386ba5d0929506155821dd4f479b0c11c9ef038c..2efd7947f6da56519723713dc310c1dd9020a6be 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1507,7 +1507,7 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pultmode, boolean rese
 		mapchangepending = 0;
 		// spawn the server if needed
 		// reset players if there is a new one
-		if (!(adminplayer == consoleplayer) && SV_SpawnServer())
+		if (server && SV_SpawnServer())
 			buf[0] &= ~(1<<1);
 
 		// Kick bot from special stages
diff --git a/src/f_finale.c b/src/f_finale.c
index 507616f3ca37c841802d6ec455dcebc9f7adf539..dae2ed57fbf6d2c6520df7bb6b0669638ae2f68e 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1721,10 +1721,7 @@ static void F_AdvanceToNextScene(void)
 void F_EndCutScene(void)
 {
 	if (runningprecutscene)
-	{
-		if (server)
-			D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, false);
-	}
+		D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, false);
 	else
 	{
 		if (cutnum == creditscutscene-1)
diff --git a/src/g_game.c b/src/g_game.c
index e763c1e90835fdd450ca31ad6590db72db28ab86..737f931603defe05a0436369917570d61b3ad275 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2866,7 +2866,7 @@ void G_NextLevel(void)
 
 static void G_DoWorldDone(void)
 {
-	if (server)
+	//if (server)
 	{
 		if (gametype == GT_COOP)
 			// don't reset player between maps