diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
index cfe09a93..e3496a82 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
@@ -275,10 +275,9 @@ public class BukkitCommandManager extends CommandManager<
     }
 
     public void unregisterCommands() {
-        for (Map.Entry<String, BukkitRootCommand> entry : registeredCommands.entrySet()) {
-            unregisterCommand(entry.getValue());
+        while (!registeredCommands.isEmpty()) {
+            unregisterCommand(registeredCommands.values().toArray(new BukkitRootCommand[]{})[0]);
         }
-        this.registeredCommands.clear();
     }