diff --git a/lib/commander.js b/lib/commander.js
index <HASH>..<HASH> 100644
--- a/lib/commander.js
+++ b/lib/commander.js
@@ -44,14 +44,14 @@ Commander.prototype.on = function (message, callback) {
 };
 
 Commander.prototype.getCommandString = function (privmsg) {
-    if (privmsg.isQuery) {
-        return privmsg.message;
-    }
-
     if (privmsg.message[0] === this.trigger[0]) {
         return privmsg.message.substr(1);
     }
 
+    if (privmsg.isQuery) {
+        return privmsg.message;
+    }
+
     if (privmsg.message.indexOf(this.ctx.nick()) === 0) {
         var msg = privmsg.message.substr(privmsg.message.indexOf(" ") + 1);
Test suite passed; !cmd in PRIVMSG now allowed