diff --git a/src/p_user.c b/src/p_user.c
index e3402c833..f9aa4bbfb 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2882,7 +2882,9 @@ static void P_DeathThink(player_t *player)
 	}
 
 	// Spectate another player after 2 seconds
-	if (G_IsPartyLocal(player - players) && playerGone == true && (gametyperules & GTR_BUMPERS) && player->deadtimer == 2*TICRATE)
+	if (G_IsPartyLocal(player - players) && playerGone == true &&
+		(gametyperules & GTR_BUMPERS) && battleprisons == false &&
+		player->deadtimer == 2*TICRATE)
 	{
 		K_ToggleDirector(G_PartyPosition(player - players), true);
 	}