diff --git a/state.go b/state.go
index 2bdf35f..5e01c96 100644
--- a/state.go
+++ b/state.go
@@ -40,6 +40,13 @@ func (s *State) OnReady(r *Ready) error {
 	defer s.Unlock()
 
 	s.Ready = *r
+
+	for _, g := range s.Guilds {
+		for _, c := range g.Channels {
+			c.GuildID = g.ID
+		}
+	}
+
 	return nil
 }