diff --git a/src/k_bot.cpp b/src/k_bot.cpp
index 72bb4eb07..109eacb74 100644
--- a/src/k_bot.cpp
+++ b/src/k_bot.cpp
@@ -359,10 +359,6 @@ void K_UpdateMatchRaceBots(void)
 --------------------------------------------------*/
 boolean K_PlayerUsesBotMovement(const player_t *player)
 {
-
-	if (player->exiting)
-		return false;
-
 	if (player->bot)
 		return true;
 
@@ -1541,6 +1537,14 @@ static void K_BuildBotTiccmdNormal(player_t *player, ticcmd_t *cmd)
 		return;
 	}
 
+	if (player->exiting)
+	{
+
+		//Bot finish
+		// TODO: Make bots spin around like a player would based on random chance
+		return;
+	}
+
 	if (player->botvars.respawnconfirm >= BOTRESPAWNCONFIRM)
 	{
 		// We want to respawn. Simply hold brake and stop here!