diff --git a/lib/battle/CUnitState.cpp b/lib/battle/CUnitState.cpp
index a0814ae80..36f482a34 100644
--- a/lib/battle/CUnitState.cpp
+++ b/lib/battle/CUnitState.cpp
@@ -614,7 +614,7 @@ uint8_t CUnitState::getSootingRangeDistance() const
 	if(!isShooter())
 		return 0;
 
-	uint8_t shootingRangeDistance = GameConstants::BATTLE_PENALTY_DISTANCE;
+	uint8_t shootingRangeDistance = 255; // no range limit for shooters
 
 	// overwrite full ranged damage distance with the value set in Additional info field of LIMITED_SHOOTING_RANGE bonus
 	if(this->hasBonus(Selector::type()(BonusType::LIMITED_SHOOTING_RANGE)))