diff --git a/blackwidowpluginbukkit/src/main/java/io/github/arcaneplugins/blackwidow/plugin/bukkit/command/CommandManager.java b/blackwidowpluginbukkit/src/main/java/io/github/arcaneplugins/blackwidow/plugin/bukkit/command/CommandManager.java
index d45c5ab..4a9a17f 100644
--- a/blackwidowpluginbukkit/src/main/java/io/github/arcaneplugins/blackwidow/plugin/bukkit/command/CommandManager.java
+++ b/blackwidowpluginbukkit/src/main/java/io/github/arcaneplugins/blackwidow/plugin/bukkit/command/CommandManager.java
@@ -56,13 +56,12 @@ public void load() {
 
     public void disable() {
         plugin().getLogger().info("Disabling commands.");
-        CommandAPI.unregister("blackwidow", true);
-        CommandAPI.onDisable();
         CommandAPI.getRegisteredCommands()
             .stream()
             .map(RegisteredCommand::commandName)
             .iterator()
             .forEachRemaining(CommandAPI::unregister);
+        CommandAPI.onDisable();
     }
 
     private BlackWidow plugin() {