diff --git a/state/state.go b/state/state.go
index 6e8181b..b1c2e1b 100644
--- a/state/state.go
+++ b/state/state.go
@@ -508,6 +508,7 @@ func (s *State) Message(channelID, messageID discord.Snowflake) (*discord.Messag
 	}
 
 	m.ChannelID = c.ID
+	m.GuildID = c.GuildID
 
 	return m, s.Store.MessageSet(m)
 }