diff --git a/bot.js b/bot.js
index d187080..8881f3a 100644
--- a/bot.js
+++ b/bot.js
@@ -36,8 +36,6 @@ function isNumeric(n) {
 
 // Event handlers
 function onMessageHandler (channel, userstate, message, self) {
-	if (self) { return; }
-
 	var trimmedMessage = message.trim();
 
 	if (trimmedMessage.startsWith("!buttsbot")) {
@@ -116,6 +114,8 @@ function onMessageHandler (channel, userstate, message, self) {
 			console.log(`* buttsbot: User not authorized`);
 		}
 	} else {
+		if (self) return;
+
 		if (trimmedMessage.startsWith("!"))
 			return;