diff --git a/Source/Game/Entities/Unit/Unit.Pets.cs b/Source/Game/Entities/Unit/Unit.Pets.cs
index 627108568..baccc9ae7 100644
--- a/Source/Game/Entities/Unit/Unit.Pets.cs
+++ b/Source/Game/Entities/Unit/Unit.Pets.cs
@@ -460,7 +460,7 @@ namespace Game.Entities
                 type = CharmType.Charm;
 
             CastStop();
-            CombatStop(); // @todo CombatStop(true) may cause crash (interrupt spells)
+            AttackStop();
 
             if (_oldFactionId != 0)
             {