diff --git a/src/listeners/client/messageCreate.ts b/src/listeners/client/messageCreate.ts
index 73188ca3..dbeebe8e 100644
--- a/src/listeners/client/messageCreate.ts
+++ b/src/listeners/client/messageCreate.ts
@@ -42,6 +42,7 @@ export default class MessageCreateListener extends Listener {
     yield await this._quoteLinkedMessage(message);
     yield await this._antispamSnippetsChannel(message);
     yield await this._checkCreationsChannelRules(message);
+    yield await this._checkMediaDiscordapp(message);
     return false;
   }
 
@@ -92,6 +93,14 @@ export default class MessageCreateListener extends Listener {
     return false;
   }
 
+  private async _checkMediaDiscordapp(message: GuildMessage): Promise<boolean> {
+    if (!/media\.discordapp\.net+/.test(message.content))
+      return false;
+    await message.channel.send(message.content.replace(/media\.discordapp\.net+/, 'cdn.discordapp.com'));
+    await message.delete();
+    return false;
+  }
+
   private async _handleSuggestion(message: GuildMessage): Promise<boolean> {
     // Send embed and add reactions in the Suggestion channel.
     if (message.channel.id === settings.channels.suggestions) {