diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs
index 333fbae2e..d70a1c956 100644
--- a/Source/Game/AI/SmartScripts/SmartAI.cs
+++ b/Source/Game/AI/SmartScripts/SmartAI.cs
@@ -741,7 +741,7 @@ namespace Game.AI
 
             _isCharmed = charmed;
 
-            if (charmed)
+            if (charmed && !me.IsPossessed() && !me.IsVehicle())
                 me.GetMotionMaster().MoveFollow(me.GetCharmer(), SharedConst.PetFollowDist, me.GetFollowAngle());
 
             if (!charmed && !me.IsInEvadeMode())