diff --git a/paper-server/nms-patches/PlayerChunk.patch b/paper-server/nms-patches/PlayerChunk.patch
index 6259d805e2..d35f4afb43 100644
--- a/paper-server/nms-patches/PlayerChunk.patch
+++ b/paper-server/nms-patches/PlayerChunk.patch
@@ -41,7 +41,7 @@
          if (chunk != null) {
              byte b0 = (byte) SectionPosition.a(blockposition.getY());
  
-+            if (b0 >= this.dirtyBlocks.length) return; // CraftBukkit - SPIGOT-6086
++            if (b0 < 0 || b0 >= this.dirtyBlocks.length) return; // CraftBukkit - SPIGOT-6086, SPIGOT-6296
              if (this.dirtyBlocks[b0] == null) {
                  this.p = true;
                  this.dirtyBlocks[b0] = new ShortArraySet();