diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2c48addcce..019a0b1431 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -126,17 +126,20 @@ public final class CraftServer implements Server {
         } else {
             pluginFolder.mkdir();
         }
-
-        commandMap.registerServerAliases();
     }
 
     public void enablePlugins(PluginLoadOrder type) {
         Plugin[] plugins = pluginManager.getPlugins();
+
         for (Plugin plugin : plugins) {
             if ((!plugin.isEnabled()) && (plugin.getDescription().getLoad() == type)) {
                 loadPlugin(plugin);
             }
         }
+
+        if (type == PluginLoadOrder.POSTWORLD) {
+            commandMap.registerServerAliases();
+        }
     }
 
     public void disablePlugins() {