diff --git a/patches/server/Chunk-System-Starlight-from-Moonrise.patch b/patches/server/Chunk-System-Starlight-from-Moonrise.patch
index afdb65615..6f6619ebf 100644
--- a/patches/server/Chunk-System-Starlight-from-Moonrise.patch
+++ b/patches/server/Chunk-System-Starlight-from-Moonrise.patch
@@ -29481,6 +29481,19 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+@@ -0,0 +0,0 @@ public class CraftChunk implements Chunk {
+     }
+ 
+     public ChunkAccess getHandle(ChunkStatus chunkStatus) {
++        // Paper start - rewrite chunk system
++        net.minecraft.world.level.chunk.LevelChunk full = this.worldServer.getChunkIfLoaded(this.x, this.z);
++        if (full != null) {
++            return full;
++        }
++        // Paper end - rewrite chunk system
+         ChunkAccess chunkAccess = this.worldServer.getChunk(this.x, this.z, chunkStatus);
+ 
+         // SPIGOT-7332: Get unwrapped extension
 @@ -0,0 +0,0 @@ public class CraftChunk implements Chunk {
  
      @Override