diff --git a/lib/structures/Guild.js b/lib/structures/Guild.js
index <HASH>..<HASH> 100644
--- a/lib/structures/Guild.js
+++ b/lib/structures/Guild.js
@@ -48,9 +48,7 @@ class Guild extends Base {
 
         for(var channel of data.channels) {
             channel = this.channels.add(channel, this);
-            if(!client.options.restMode) {
-                client.channelGuildMap[channel.id] = this.id;
-            }
+            client.channelGuildMap[channel.id] = this.id;
         }
 
         this.defaultChannel = this.channels.get(this.id);
@@ -96,7 +94,7 @@ class Guild extends Base {
                         client.emit("error", err, this.shard.id);
                         continue;
                     }
-                    if(!client.options.restMode && client.options.seedVoiceConnections && voiceState.id === client.user.id && !client.voiceConnections.get(this.id)) {
+                    if(client.options.seedVoiceConnections && voiceState.id === client.user.id && !client.voiceConnections.get(this.id)) {
                         process.nextTick(() => this.shard.client.joinVoiceChannel(voiceState.channel_id, false));
                     }
                 }
Fix guild channel mapping in restMode