diff --git a/discord/state.py b/discord/state.py
index 7ff05b3bf..79054beec 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -826,8 +826,11 @@ class ConnectionState:
             return PartialReactionEmoji(id=emoji_id, name=data['name'])
 
     def _upgrade_partial_emoji(self, emoji):
+        emoji_id = emoji.id
+        if not emoji_id:
+            return emoji.name
         try:
-            return self._emojis[emoji.id]
+            return self._emojis[emoji_id]
         except KeyError:
             return emoji