diff --git a/src/Client.js b/src/Client.js
index 7ca61cdad..06def03ea 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -1303,19 +1303,12 @@ class Client extends EventEmitter {
 					var channel = self.getChannel("id", data.id);
 
 					if (channel) {
-
-						var server = channel.server;
-
-						if (server) {
-
-							server.channels.splice(server.channels.indexOf(channel), 1);
-
-						}
+							
+						self.channelCache.splice(self.channelCache.indexOf(channel), 1);
+						server.channels.splice(server.channels.indexOf(channel), 1);
 
 						self.emit("channelDelete", channel);
 
-						self.serverCache.splice(self.serverCache.indexOf(channel), 1);
-
 					}
 
 					break;