diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14879d3f..f54f7018 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - loadCommands no longer counts/loads "Ghost" commands.
 - DMs throwing errors with new Config System && permLevel
 - Fixed Reload not erroring on new commands that aren't found
+- Fixed Bug on Selfbot mentions introduced with the new Argument Prompts
 
 ### Removed
 - Old Configuration System
diff --git a/app.js b/app.js
index d018c2a6..179a8077 100644
--- a/app.js
+++ b/app.js
@@ -65,12 +65,12 @@ exports.start = (config) => {
     if (conf.prefix instanceof Array) {
       conf.prefix.forEach((prefix) => {
         if (msg.content.startsWith(prefix)) thisPrefix = prefix;
+        else thisPrefix = prefix[0];
       });
-    } else if (msg.content.startsWith(conf.prefix)) {
+    } else {
       thisPrefix = conf.prefix;
     }
-    if (!thisPrefix) return;
-    if (client.config.prefixMention && !client.config.prefixMention.test(msg.content)) return;
+    if (msg.content.startsWith(thisPrefix) && client.config.prefixMention && !client.config.prefixMention.test(msg.content)) return;
     let prefixLength = thisPrefix.length;
     if (client.config.prefixMention && client.config.prefixMention.test(msg.content)) prefixLength = client.config.prefixMention.exec(msg.content)[0].length + 1;
     const command = msg.content.slice(prefixLength).split(" ")[0].toLowerCase();