diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs
index 68bfed014..fdd916cc8 100644
--- a/Source/Game/AI/CoreAI/CreatureAI.cs
+++ b/Source/Game/AI/CoreAI/CreatureAI.cs
@@ -290,7 +290,7 @@ namespace Game.AI
 
         public bool _EnterEvadeMode(EvadeReason why = EvadeReason.Other)
         {
-            if (me.IsInEvadeMode())
+            if (!IsEngaged())
                 return false;
 
             if (!me.IsAlive())
@@ -455,11 +455,7 @@ namespace Game.AI
         public virtual void JustEngagedWith(Unit who) { }
 
         // Called when the creature is killed
-        public virtual void JustDied(Unit killer) 
-        {
-            if (IsEngaged())
-                EngagementOver();
-        }
+        public virtual void JustDied(Unit killer) { }
 
         // Called when the creature kills a unit
         public virtual void KilledUnit(Unit victim) { }
diff --git a/Source/Game/Maps/ObjectGridLoader.cs b/Source/Game/Maps/ObjectGridLoader.cs
index a66f84087..9e417f5d7 100644
--- a/Source/Game/Maps/ObjectGridLoader.cs
+++ b/Source/Game/Maps/ObjectGridLoader.cs
@@ -214,11 +214,7 @@ namespace Game.Maps
                 creature.RemoveAllAreaTriggers();
 
                 if (creature.IsInCombat())
-                {
                     creature.CombatStop();
-                    if (creature.IsAIEnabled())
-                        creature.GetAI().EnterEvadeMode();
-                }
             }
         }
     }