diff --git a/src/g_game.c b/src/g_game.c
index 18605d9fa..4a4d25f1a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2879,7 +2879,7 @@ mapthing_t *G_FindMapStart(INT32 playernum)
 
 	// -- DM/Tag/CTF-spectator/etc --
 	// Order: DM->CTF->Race
-	else if (gametyperules & GTR_BATTLESTARTS)
+	else if ((gametyperules & GTR_BATTLESTARTS) && !battleprisons)
 		spawnpoint = G_FindBattleStartOrFallback(playernum);
 
 	// -- Other game modes --