diff --git a/Spigot-Server-Patches/0178-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0178-Disable-Vanilla-Chunk-GC.patch
new file mode 100644
index 0000000000..d629e7a0f4
--- /dev/null
+++ b/Spigot-Server-Patches/0178-Disable-Vanilla-Chunk-GC.patch
@@ -0,0 +1,33 @@
+From 8e28660b4ee39ff1513a7aed26639e343bc7050e Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 26 Sep 2016 01:51:30 -0400
+Subject: [PATCH] Disable Vanilla Chunk GC
+
+Bukkit has its own system for this.
+
+diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index 26ab536..777a5df 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
++++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -1036,7 +1036,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+ 
+             chunkproviderserver.a(flag);
+             // CraftBukkit - ArrayList -> Collection
+-            Collection arraylist = chunkproviderserver.a();
++            /* //Paper start Collection arraylist = chunkproviderserver.a();
+             Iterator iterator = arraylist.iterator();
+ 
+             while (iterator.hasNext()) {
+@@ -1045,7 +1045,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+                 if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
+                     chunkproviderserver.unload(chunk);
+                 }
+-            }
++            }*/
++            // Paper end
+ 
+         }
+     }
+-- 
+1.9.1
+