diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs
index 39e00ce6e..bb3ce35e0 100644
--- a/Source/Game/Entities/Unit/Unit.Movement.cs
+++ b/Source/Game/Entities/Unit/Unit.Movement.cs
@@ -1308,6 +1308,8 @@ namespace Game.Entities
                     GetMotionMaster().Remove(MovementGeneratorType.Fleeing);
                     if (GetVictim() != null)
                         SetTarget(GetVictim().GetGUID());
+                    if (!IsPlayer() && !IsInCombat())
+                        GetMotionMaster().MoveTargetedHome();
                 }
             }