diff --git a/src/stores/ChannelStore.js b/src/stores/ChannelStore.js
index e745eea33..64c482cb3 100644
--- a/src/stores/ChannelStore.js
+++ b/src/stores/ChannelStore.js
@@ -55,7 +55,7 @@ class ChannelStore extends DataStore {
   add(data, guild, cache = true) {
     const existing = this.get(data.id);
     if (existing && existing._patch && cache) existing._patch(data);
-    if (existing) {
+    if (existing && guild) {
       guild.channels.add(existing);
       return existing;
     }