diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs
index 97fa1ae65..df63c570c 100644
--- a/Source/Game/AI/CoreAI/CreatureAI.cs
+++ b/Source/Game/AI/CoreAI/CreatureAI.cs
@@ -57,6 +57,9 @@ namespace Game.AI
                         me.EngageWithTarget(lastCharmer);
                 }
                 me.LastCharmerGUID.Clear();
+
+                if (!me.IsInCombat())
+                    EnterEvadeMode(EvadeReason.NoHostiles);
             }
 
             base.OnCharmed(isNew);
diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs
index 940389586..333fbae2e 100644
--- a/Source/Game/AI/SmartScripts/SmartAI.cs
+++ b/Source/Game/AI/SmartScripts/SmartAI.cs
@@ -760,6 +760,9 @@ namespace Game.AI
                             me.EngageWithTarget(lastCharmer);
                     }
                     me.LastCharmerGUID.Clear();
+
+                    if (!me.IsInCombat())
+                        EnterEvadeMode(EvadeReason.NoHostiles);
                 }
             }