diff --git a/paper-server/nms-patches/ChunkMapDistance.patch b/paper-server/nms-patches/ChunkMapDistance.patch
index 5a7f15d082..2949966983 100644
--- a/paper-server/nms-patches/ChunkMapDistance.patch
+++ b/paper-server/nms-patches/ChunkMapDistance.patch
@@ -101,7 +101,15 @@
      }
  
      public <T> void addTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
-@@ -251,6 +281,26 @@
+@@ -210,6 +240,7 @@
+     public void b(SectionPosition sectionposition, EntityPlayer entityplayer) {
+         long i = sectionposition.r().pair();
+         ObjectSet<EntityPlayer> objectset = (ObjectSet) this.c.get(i);
++        if (objectset == null) return; // CraftBukkit - SPIGOT-6208
+ 
+         objectset.remove(entityplayer);
+         if (objectset.isEmpty()) {
+@@ -251,6 +282,26 @@
          return this.i.a();
      }