diff --git a/bukkit/src/main/java/org/popcraft/chunky/platform/BukkitWorld.java b/bukkit/src/main/java/org/popcraft/chunky/platform/BukkitWorld.java
index 409b6125..24673e52 100644
--- a/bukkit/src/main/java/org/popcraft/chunky/platform/BukkitWorld.java
+++ b/bukkit/src/main/java/org/popcraft/chunky/platform/BukkitWorld.java
@@ -127,8 +127,8 @@ public Border getWorldBorder() {
 
     @Override
     public int getElevation(final int x, final int z) {
-        if (Folia.isFolia()) {
-            final org.bukkit.Location location = new org.bukkit.Location(world, x, 0, z);
+        final org.bukkit.Location location = new org.bukkit.Location(world, x, 0, z);
+        if (Folia.isFolia() && !Folia.isTickThread(location)) {
             return CompletableFuture
                     .supplyAsync(() -> getElevationForLocation(x, z), command -> Folia.schedule(plugin, location, command))
                     .join();