diff --git a/Spigot-Server-Patches/ChunkMap-caching.patch b/Spigot-Server-Patches/ChunkMap-caching.patch
index 19ea6a43f0..635faac66b 100644
--- a/Spigot-Server-Patches/ChunkMap-caching.patch
+++ b/Spigot-Server-Patches/ChunkMap-caching.patch
@@ -17,6 +17,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private int emptySectionBits;
 +
 +    public PacketPlayOutMapChunk.ChunkMap getChunkMap() {
++        if (!world.paperSpigotConfig.cacheChunkMaps) {
++            return PacketPlayOutMapChunk.a(this, true, !world.worldProvider.o(), '\uffff');
++        }
++
 +        boolean isDirty = false;
 +        for (int i = 0; i < sections.length; ++i) {
 +            ChunkSection section = sections[i];
@@ -110,6 +114,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
              this.a[j] = chunk.locX;
              this.b[j] = chunk.locZ;
+diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
+     {
+         mobSpawnerTickRate = getInt( "mob-spawner-tick-rate", 1 );
+     }
++
++    public boolean cacheChunkMaps;
++    private void cacheChunkMaps()
++    {
++        cacheChunkMaps = getBoolean( "cache-chunk-maps", false );
++    }
+ }
 -- 
 1.9.5.msysgit.1