diff --git a/src/client/actions/ChannelDelete.js b/src/client/actions/ChannelDelete.js
index e4e46849b..6def6291e 100644
--- a/src/client/actions/ChannelDelete.js
+++ b/src/client/actions/ChannelDelete.js
@@ -1,4 +1,5 @@
 const Action = require('./Action');
+const DMChannel = require('../../structures/DMChannel');
 
 class ChannelDeleteAction extends Action {
   constructor(client) {
@@ -17,7 +18,14 @@ class ChannelDeleteAction extends Action {
     } else {
       channel = this.deleted.get(data.id) || null;
     }
-    if (channel) channel.deleted = true;
+    if (channel) {
+      if (channel.messages && !(channel instanceof DMChannel)) {
+        for (const message of channel.messages.values()) {
+          message.deleted = true;
+        }
+      }
+      channel.deleted = true;
+    }
 
     return { channel };
   }