diff --git a/lib/structures/Message.js b/lib/structures/Message.js
index f18b35c19..f4d1ca703 100644
--- a/lib/structures/Message.js
+++ b/lib/structures/Message.js
@@ -128,8 +128,8 @@ class Message extends Base {
             this.mentions.forEach((mention) => {
                 if(this.channel.guild) {
                     var member = this.channel.guild.members.get(mention.id);
-                    if(member) {
-                        cleanContent = cleanContent.replace(new RegExp(`<@!?${mention.id}>`, "g"), "@" + member.nick || mention.username);
+                    if(member && member.nick) {
+                        cleanContent = cleanContent.replace(new RegExp(`<@!?${mention.id}>`, "g"), "@" + member.nick);
                     }
                 }
                 cleanContent = cleanContent.replace(new RegExp(`<@!?${mention.id}>`, "g"), "@" + mention.username);