diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2b7f5e9ee2..1c6c7b9682 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -50,6 +50,8 @@ public final class CraftServer implements Server {
         this.server = server;
         this.serverVersion = CraftServer.class.getPackage().getImplementationVersion();
 
+        Bukkit.setServer(this);
+
         Logger.getLogger("Minecraft").log(Level.INFO, "This server is running " + getName() + " version " + getVersion());
     }