diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index ce329d9..7980b4b 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -284,9 +284,11 @@ void Player::UpdateEmote()
         emotes = &itr->second;
     }
 
-    cs::MFEmote* emote = emotes->Add();
-    emote->set_emote_id(emote_id);
-    emote->set_player_id(entity_uniid);
+    {
+        cs::MFEmote* p = emotes->Add();
+        p->set_emote_id(emote_id);
+        p->set_player_id(entity_uniid);
+    }
 
     emote = false;
     emote_id = 0;