diff --git a/src/k_kart.c b/src/k_kart.c
index 8d5905866..80d65ad3b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8985,9 +8985,10 @@ static INT32 K_FlameShieldMax(player_t *player)
 			disttofinish = players[i].distancetofinish;
 	}
 
-	if (numplayers <= 1)
+	if (numplayers <= 1 || gametype == GT_BATTLE)
 	{
 		return 16; // max when alone, for testing
+		// and when in battle, for chaos
 	}
 	else if (player->position == 1)
 	{