1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 4b61ec61..b6eab2c7 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -329,7 +329,11 @@ void BeingHandler::handleMessage(MessageIn &msg)
             }
 
             if (player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE))
-                dstBeing->setEmote(msg.readInt8(), EMOTION_TIME);
+            {
+                // only set emote if one doesnt already exist
+                if (!dstBeing->mEmotion)
+                    dstBeing->setEmote(msg.readInt8(), EMOTION_TIME);
+            }
 
             break;