diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d1139422e0..b1ee1cb670 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -74,6 +74,10 @@ public class CraftWorld implements World {
     }
 
     public int getHighestBlockYAt(int x, int z) {
+        if (!isChunkLoaded(x >> 4, z >> 4)){
+            loadChunk(x >> 4, z >> 4);
+        }
+
         return world.getHighestBlockYAt(x, z);
     }