diff --git a/paper-server/patches/sources/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java.patch b/paper-server/patches/sources/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java.patch
index dfd1c2e4d7be..0f7ba0ababea 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java.patch
@@ -1,5 +1,23 @@
 --- a/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
+@@ -67,7 +_,7 @@
+     }
+ 
+     private static Aquifer.FluidPicker createFluidPicker(final NoiseGeneratorSettings settings) {
+-        Aquifer.FluidStatus lavaStatus = new Aquifer.FluidStatus(-54, Blocks.LAVA.defaultBlockState());
++        Aquifer.FluidStatus lavaStatus = new Aquifer.FluidStatus(settings.noiseSettings().minY() + 10, Blocks.LAVA.defaultBlockState()); // Fixes MC-237017 (non hardcoded lava level)
+         int seaLevel = settings.seaLevel();
+         Aquifer.FluidStatus seaStatus = new Aquifer.FluidStatus(seaLevel, settings.defaultFluid());
+         Aquifer.FluidStatus emptyStatus = new Aquifer.FluidStatus(DimensionType.MIN_Y * 2, Blocks.AIR.defaultBlockState());
+@@ -75,7 +_,7 @@
+             if (SharedConstants.DEBUG_DISABLE_FLUID_GENERATION) {
+                 return emptyStatus;
+             } else {
+-                return y < Math.min(-54, seaLevel) ? lavaStatus : seaStatus;
++                return y < Math.min(settings.noiseSettings().minY() + 10, seaLevel) ? lavaStatus : seaStatus;  // Fixes MC-237017 (non hardcoded lava level)
+             }
+         };
+     }
 @@ -266,7 +_,7 @@
      @Override
      public void buildSurface(final WorldGenRegion region, final StructureManager structureManager, final RandomState randomState, final ChunkAccess protoChunk) {