diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java
index 6e04951..f659422 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java
@@ -75,6 +75,7 @@ public class ServerUtils extends JavaPlugin implements CommandExecutor {
     public void onDisable() {
         super.onDisable();
         restoreBukkitPluginCommand();
+        commandManager.unregisterCommands();
         plugin.disable();
     }
 
diff --git a/Bungee/src/main/java/net/frankheijden/serverutils/bungee/ServerUtils.java b/Bungee/src/main/java/net/frankheijden/serverutils/bungee/ServerUtils.java
index 0972d98..b5994b2 100644
--- a/Bungee/src/main/java/net/frankheijden/serverutils/bungee/ServerUtils.java
+++ b/Bungee/src/main/java/net/frankheijden/serverutils/bungee/ServerUtils.java
@@ -62,6 +62,7 @@ public class ServerUtils extends Plugin {
     @Override
     public void onDisable() {
         super.onDisable();
+        commandManager.unregisterCommands();
         plugin.disable();
     }