diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
index 18b2218e..ea7ada06 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
@@ -151,8 +151,11 @@ private static void register(
             }
         }
 
-        command.setExecutor(atCommand);
-        command.setTabCompleter(atCommand);
+        if (command.getExecutor() != atCommand) {
+            command.setExecutor(atCommand);
+            command.setTabCompleter(atCommand);
+        }
+
         registeredCommands.put(name, command);
     }