diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js
index a2bf2800b..7cc0abde2 100644
--- a/src/client/rest/RESTMethods.js
+++ b/src/client/rest/RESTMethods.js
@@ -59,7 +59,7 @@ class RESTMethods {
 
       if (content) {
         if (disableEveryone || (typeof disableEveryone === 'undefined' && this.rest.client.options.disableEveryone)) {
-          content = content.replace('@everyone', '@\u200beveryone').replace('@here', '@\u200bhere');
+          content = content.replace(/@(everyone|here)/g, '@\u200b$1');
         }
 
         if (split) content = splitMessage(content, typeof split === 'object' ? split : {});
diff --git a/src/structures/Message.js b/src/structures/Message.js
index 6b0ae77c3..e9e093ac5 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -236,8 +236,7 @@ class Message {
    */
   get cleanContent() {
     return this.content
-      .replace(/@everyone/g, '@\u200Beveryone')
-      .replace(/@here/g, '@\u200Bhere')
+      .replace(/@(everyone|here)/g, '@\u200b$1')
       .replace(/<@!?[0-9]+>/g, (input) => {
         const id = input.replace(/<|!|>|@/g, '');
         if (this.channel.type === 'dm' || this.channel.type === 'group') {