1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 55435379a73..2766d31d6bc 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10550,8 +10550,12 @@ void Unit::ClearInCombat()
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
 
     // Player's state will be cleared in Player::UpdateContestedPvP
-    if(GetTypeId()!=TYPEID_PLAYER)
+    if(GetTypeId() != TYPEID_PLAYER)
+    {
         clearUnitState(UNIT_STAT_ATTACK_PLAYER);
+        if(HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER))
+            SetUInt32Value(UNIT_DYNAMIC_FLAGS, ((Creature*)this)->GetCreatureInfo()->dynamicflags);
+    }
     else
         ((Player*)this)->UpdatePotionCooldown();