diff --git a/disco/state.py b/disco/state.py
index 689ab62..2983aa0 100644
--- a/disco/state.py
+++ b/disco/state.py
@@ -309,6 +309,9 @@ class State(object):
         if event.guild_id not in self.guilds:
             return
 
+        for emoji in event.emojis:
+            emoji.guild_id = event.guild_id
+
         self.guilds[event.guild_id].emojis = HashMap({i.id: i for i in event.emojis})
 
     def on_presence_update(self, event):