diff --git a/src/client/ClientDataManager.js b/src/client/ClientDataManager.js
index 8ef270a50..693358154 100644
--- a/src/client/ClientDataManager.js
+++ b/src/client/ClientDataManager.js
@@ -55,7 +55,9 @@ class ClientDataManager {
       channel = new GroupDMChannel(this.client, data);
     } else {
       guild = guild || this.client.guilds.get(data.guild_id);
-      if (guild) {
+      if (already) {
+        channel = this.client.channels.get(data.id);
+      } else if (guild) {
         if (data.type === Constants.ChannelTypes.TEXT) {
           channel = new TextChannel(guild, data);
           guild.channels.set(channel.id, channel);