diff --git a/src/main/java/net/md_5/bungee/BungeeCord.java b/src/main/java/net/md_5/bungee/BungeeCord.java
index bf801b488..3e13505ba 100644
--- a/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -120,7 +120,10 @@ public class BungeeCord
         String[] split = commandLine.trim().split(" ");
         String commandName = split[0].toLowerCase();
         Command command = commandMap.get(commandName);
-        if (command != null && (config.disabledCommands == null || !config.disabledCommands.contains(commandName)))
+        if (config.disabledCommands == null || !config.disabledCommands.contains(commandName))
+        {
+            return false;
+        } else if (command != null)
         {
             String[] args = Arrays.copyOfRange(split, 1, split.length);
             try