diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
index e56afe5181..39953aa7f3 100644
--- a/core/src/mindustry/ai/types/CommandAI.java
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -21,14 +21,20 @@ public class CommandAI extends AIController{
             targetPos.set(attackTarget);
         }
 
+
+
         if(targetPos != null){
-            moveTo(targetPos, attackTarget != null ? unit.type.range - 10f : 5f);
+            moveTo(targetPos, attackTarget != null ? unit.type.range - 10f : 0f);
 
             if(unit.isFlying()){
                 unit.lookAt(targetPos);
             }else{
                 faceTarget();
             }
+
+            if(attackTarget == null && unit.within(targetPos, Math.max(5f, unit.hitSize) / 2.9f)){
+                targetPos = null;
+            }
         }else if(target != null){
             faceTarget();
         }