diff --git a/bukkit/src/main/java/net/pl3x/map/bukkit/BukkitWorld.java b/bukkit/src/main/java/net/pl3x/map/bukkit/BukkitWorld.java
index 76465c4db..93d95b12e 100644
--- a/bukkit/src/main/java/net/pl3x/map/bukkit/BukkitWorld.java
+++ b/bukkit/src/main/java/net/pl3x/map/bukkit/BukkitWorld.java
@@ -114,7 +114,7 @@ public int getMinBuildHeight() {
 
     @Override
     public int getMaxBuildHeight() {
-        return this.level.getMaxY();
+        return this.level.getMaxY() + 1;
     }
 
     @Override
diff --git a/core/src/main/java/net/pl3x/map/core/renderer/NetherRoofRenderer.java b/core/src/main/java/net/pl3x/map/core/renderer/NetherRoofRenderer.java
index 012849350..601049ba1 100644
--- a/core/src/main/java/net/pl3x/map/core/renderer/NetherRoofRenderer.java
+++ b/core/src/main/java/net/pl3x/map/core/renderer/NetherRoofRenderer.java
@@ -71,7 +71,7 @@ public void scanData(@NotNull Region region) {
                     continue;
                 }
 
-                int blockY = getWorld().getMaxBuildHeight() + 1;
+                int blockY = chunk.noHeightmap() ? getWorld().getMaxBuildHeight() : chunk.getWorldSurfaceY(blockX, blockZ) + 1;
                 int fluidY = 0;
                 BlockState blockstate;
                 BlockState fluidstate = null;
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/server/FabricWorld.java b/fabric/src/main/java/net/pl3x/map/fabric/server/FabricWorld.java
index 30db39005..f4432e5af 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/server/FabricWorld.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/server/FabricWorld.java
@@ -114,7 +114,7 @@ public int getMinBuildHeight() {
 
     @Override
     public int getMaxBuildHeight() {
-        return this.level.getMaxY();
+        return this.level.getMaxY() + 1;
     }
 
     @Override
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ce6b06f44..29d214d8f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ shadowJar="8.3.3" # https://github.com/GradleUp/shadow
 
 adventure="4.18.0-SNAPSHOT"
 adventureBukkit="4.3.5-SNAPSHOT" # https://github.com/KyoriPowered/adventure-platform
-adventureFabric="6.1.0-SNAPSHOT" # https://github.com/KyoriPowered/adventure-platform-fabric
+adventureFabric="6.1.1-SNAPSHOT" # https://github.com/KyoriPowered/adventure-platform-fabric
 
 cloud="2.0.0" # https://github.com/incendo/cloud
 cloud-minecraft="2.0.0-beta.10" # https://github.com/Incendo/cloud-minecraft