diff --git a/src/Client.js b/src/Client.js
index 115cbe448..39c43e3c1 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -1369,7 +1369,10 @@ class Client extends EventEmitter {
 					if (channel) {
 
 						self.channelCache.splice(self.channelCache.indexOf(channel), 1);
-						server.channels.splice(server.channels.indexOf(channel), 1);
+						var server = self.getServer("id", data.guild_id);
+						if (server) {
+							server.channels.splice(server.channels.indexOf(channel), 1);
+						}
 
 						self.emit("channelDelete", channel);