diff --git a/src/client/actions/GuildDelete.js b/src/client/actions/GuildDelete.js
index 60d1787e3..cc12e14a9 100644
--- a/src/client/actions/GuildDelete.js
+++ b/src/client/actions/GuildDelete.js
@@ -28,6 +28,9 @@ class GuildDeleteAction extends Action {
         };
       }
 
+      for (const channel of guild.channels.values()) this.client.channels.remove(channel.id);
+      if (guild.voiceConnection) guild.voiceConnection.disconnect();
+
       // Delete guild
       client.guilds.remove(guild.id);
       client.emit(Events.GUILD_DELETE, guild);