diff --git a/Subsurface/Source/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
index bc2238579..a18c4e22e 100644
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -369,7 +369,7 @@ namespace Barotrauma
         //sight/hearing range
         public void UpdateTargets(Character character)
         {
-            wallAttackPos = Vector2.Zero;
+            var prevAiTarget = selectedAiTarget;
 
             selectedAiTarget = null;
             selectedTargetMemory = null;
@@ -456,6 +456,11 @@ namespace Barotrauma
                     }
                 }
             }
+
+            if (selectedAiTarget != prevAiTarget)
+            {
+                wallAttackPos = Vector2.Zero;
+            }
            
         }