1 files changed, 12 insertions, 5 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index b3fd3723466..a74b59c872c 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -141,17 +141,24 @@ void ScriptedAI::UpdateAI(const uint32 diff)
 
 void ScriptedAI::EnterEvadeMode()
 {
-    m_creature->InterruptNonMeleeSpells(true);
+    //m_creature->InterruptNonMeleeSpells(true);
     m_creature->RemoveAllAuras();
     m_creature->DeleteThreatList();
     m_creature->CombatStop();
     m_creature->LoadCreaturesAddon();
-
-    if (m_creature->isAlive())
-        m_creature->GetMotionMaster()->MoveTargetedHome();
-
     m_creature->SetLootRecipient(NULL);
 
+    if(m_creature->isAlive())
+    {
+        if(Unit* owner = m_creature->GetOwner())
+        {
+            if(owner->isAlive())
+                m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
+        } 
+        else
+            m_creature->GetMotionMaster()->MoveTargetedHome();
+    }
+
     InCombat = false;
     Reset();
 }