diff --git a/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch b/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch
new file mode 100644
index 000000000..3efbd60ca
--- /dev/null
+++ b/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Sun, 8 Apr 2018 01:21:23 +0100
+Subject: [PATCH] revert "Better reloading of pending unload chunks"
+
+many areas of NMS calls through to this method which means that
+the server can easilly keep chunks loaded in certain conditions
+even when they're no longer needed.
+
+diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+index 55dada668..2ed3fc40b 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 {
+     }
+ 
+     public Chunk getChunkAt(int i, int j, Runnable runnable, boolean generate) {
+-        Chunk chunk = getLoadedChunkAt(i, j);
++        Chunk chunk = getChunkIfLoaded(i, j); // Paper - revert "Better reloading of pending unload chunks" (see patch)
+         ChunkRegionLoader loader = null;
+ 
+         if (this.chunkLoader instanceof ChunkRegionLoader) {
+--
\ No newline at end of file