diff --git a/bot/bot.js b/bot/bot.js
index f30d27f..5cf512f 100644
--- a/bot/bot.js
+++ b/bot/bot.js
@@ -162,7 +162,9 @@ function checkMessageForCommand(msg, isEdit) {
     if (msg.author === bot.user) {
       return;
     }
-    if (msg.author !== bot.user && msg.mentions.has(bot.user)) {
+    if (msg.author !== bot.user && msg.mentions.has(bot.user.id)) {
+      if (msg.content.includes("@here") || msg.content.includes("@everyone") 
+          return;
       msg.channel.send('yes?'); //using a mention here can lead to looping
     } else {
     }