diff --git a/state.go b/state.go
index 9ee0f0c..d63a6fb 100644
--- a/state.go
+++ b/state.go
@@ -105,6 +105,8 @@ func (s *State) GuildRemove(guild *Guild) error {
 
 	s.Lock()
 	defer s.Unlock()
+	
+	delete(s.guildMap, guild.ID)
 
 	for i, g := range s.Guilds {
 		if g.ID == guild.ID {
@@ -113,8 +115,6 @@ func (s *State) GuildRemove(guild *Guild) error {
 		}
 	}
 
-	delete(s.guildMap, guild.ID)
-
 	return nil
 }
 
@@ -259,6 +259,8 @@ func (s *State) ChannelRemove(channel *Channel) error {
 	if err != nil {
 		return err
 	}
+	
+	delete(s.channelMap, channel.ID)
 
 	if channel.IsPrivate {
 		s.Lock()
@@ -287,8 +289,6 @@ func (s *State) ChannelRemove(channel *Channel) error {
 		}
 	}
 
-	delete(s.channelMap, channel.ID)
-
 	return nil
 }