diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index 522e0578f21..040208d0431 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -710,6 +710,11 @@ void WorldSession::HandleEmoteOpcode(WorldPacket& recvData)
 
     uint32 emote;
     recvData >> emote;
+
+    // restrict to the only emotes hardcoded in client
+    if (emote != EMOTE_ONESHOT_NONE && emote != EMOTE_ONESHOT_WAVE)
+        return;
+
     sScriptMgr->OnPlayerClearEmote(GetPlayer());
 
     if (_player->GetUInt32Value(UNIT_NPC_EMOTESTATE))