diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 6c359592..bfa52426 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -580,8 +580,7 @@ void startmap(const char *name)   // called just after a map load
     particlereset();
     suicided = -1;
     spawncycle = -1;
-    if(m_mp(gamemode)) respawnself();
-    else findplayerstart(player1);
+    if(m_valid(gamemode)) respawnself();
     player1->frags = player1->flagscore = player1->deaths = player1->lifesequence = 0;
     loopv(players) if(players[i]) players[i]->frags = players[i]->flagscore = players[i]->deaths = players[i]->lifesequence = 0;
     s_strcpy(clientmap, name);