1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a9f9cb763a5..fea9a73386a 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8484,6 +8484,9 @@ bool Unit::AttackStop()
 
     SendMeleeAttackStop(victim);
 
+    if (GetTypeId() == TYPEID_PLAYER)
+        HandleEmoteCommand(EMOTE_STATE_NONE);
+
     return true;
 }