diff --git a/core/src/mindustry/client/utils/AutoShoot.kt b/core/src/mindustry/client/utils/AutoShoot.kt
index ecb0af3078..270ea6709d 100644
--- a/core/src/mindustry/client/utils/AutoShoot.kt
+++ b/core/src/mindustry/client/utils/AutoShoot.kt
@@ -54,7 +54,7 @@ fun autoShoot() {
 
     if (target == null || Client.timer.get(2, 6f)) { // Acquire target FINISHME: Heal allied units?
         if (type.canAttack) {
-            val ignoreDisarmed = Server.io()
+            val ignoreDisarmed = Server.io() && !CustomMode.defense();
             target = Units.closestEnemy(unit.team, unit.x, unit.y, unit.range()) { u -> !(ignoreDisarmed && u.disarmed) && u.checkTarget(type.targetAir, unit.type.targetGround) }
         }
         if (type.canHeal && target == null) {