diff --git a/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch b/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch
new file mode 100644
index 000000000..5e6d40558
--- /dev/null
+++ b/Spigot-Server-Patches/Unmark-chunk-as-unloading-when-unload-is-cancelled.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Thu, 12 May 2016 02:03:56 -0400
+Subject: [PATCH] Unmark chunk as unloading when unload is cancelled
+
+
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -0,0 +0,0 @@ public class Chunk {
+     private long w;
+     private int x;
+     private ConcurrentLinkedQueue<BlockPosition> y;
+-    public boolean d;
++    public boolean d;public void setShouldUnload(boolean unload) { this.d = unload; } // Paper // OBFHELPER
+     protected gnu.trove.map.hash.TObjectIntHashMap<Class> entityCount = new gnu.trove.map.hash.TObjectIntHashMap<Class>(); // Spigot
+     public int lightUpdates; // Paper - Number of queued light updates for this chunk
+ 
+diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
+                     Chunk chunk = (Chunk) this.chunks.get(olong);
+ 
+                     if (chunk != null && chunk.d) {
++                        chunk.setShouldUnload(false); // Paper
+                         if (chunk.hasLightUpdates()) continue; // Paper - Don't unload chunks with pending light updates.
+                         // CraftBukkit start
+                         ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
+--
\ No newline at end of file