diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java b/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java
index 6e84897..c584660 100644
--- a/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java
+++ b/src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java
@@ -28,15 +28,15 @@ public class CommandWhitelist extends JavaPlugin {
 
         Plugin protocollib = getServer().getPluginManager().getPlugin("ProtocolLib");
 
-        getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
         if (!isLegacy) {
             if (!getConfigCache().isUseProtocolLib() || protocollib == null || !protocollib.isEnabled()) {
                 getServer().getPluginManager().registerEvents(new PlayerCommandPreProcessListener(), this);
+                getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
             } else {
                 PacketCommandSendListener.protocol(this);
                 getLogger().info(ChatColor.AQUA+"Using ProtocolLib for command filter!");
             }
-
+            getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
         } else {
             getLogger().info(ChatColor.AQUA+"Running in legacy mode...");
             if (protocollib != null) {
@@ -46,8 +46,6 @@ public class CommandWhitelist extends JavaPlugin {
             }
         }
 
-        getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
-
         getCommand("commandwhitelist").setExecutor(new MainCommand());
         getCommand("commandwhitelist").setTabCompleter(new MainCommand());