diff --git a/index.js b/index.js
index 1b73083e..ec3e3111 100644
--- a/index.js
+++ b/index.js
@@ -41,17 +41,18 @@ client.registry
 client.on('message', message => {
     if (message.author.bot) return;
     if (message.channel.type === 'dm') return;
-    if (!message.content.startsWith(`<@${client.user.id}>`)) return;
-    if (message.guild.id !== config.server || message.guild.id !== config.personalServer || message.author.id !== config.owner) return;
-    if (message.author.id !== clevusers.allowed[message.author.id]) return;
-    let cleverMessage = message.content.replace(`<@${client.user.id}>`, "");
-    console.log(`[Cleverbot] ${cleverMessage}`);
-    message.channel.startTyping();
-    cleverbot.write(cleverMessage, async function(response) {
-        let responseMsg = await message.reply(response.output);
-        let stopType = await message.channel.stopTyping();
-        return [responseMsg, stopType];
-    });
+    if (!message.content.startsWith(`<@${client.user.id}>`)) {
+        if (message.guild.id !== config.server || message.guild.id !== config.personalServer || message.author.id !== config.owner) return;
+        if (clevusers.allowed[message.author.id]) {
+            let cleverMessage = message.content.replace(`<@${client.user.id}>`, "");
+            console.log(`[Cleverbot] ${cleverMessage}`);
+            message.channel.startTyping();
+            cleverbot.write(cleverMessage, function(response) {
+                message.reply(response.output);
+                message.channel.stopTyping();
+            });
+        }
+    }
 });
 
 client.on('messageReactionAdd', (reaction, user) => {