diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index 647bd01f1..5969b9691 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -97,8 +97,8 @@ namespace Discord.Commands
                 //Check for mention
                 if (cmdMsg == null && Config.AllowMentionPrefix)
                 {
-                    if (msg.StartsWith(e.Server.CurrentUser.Mention))
-                        cmdMsg = msg.Substring(e.Server.CurrentUser.Mention.Length + 1);
+                    if (msg.StartsWith(client.CurrentUser.Mention))
+                        cmdMsg = msg.Substring(client.CurrentUser.Mention.Length + 1);
                     else if (msg.StartsWith($"@{client.CurrentUser.Name}"))
                         cmdMsg = msg.Substring(client.CurrentUser.Name.Length + 1);
                 }