diff --git a/Spigot-Server-Patches/GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/GH-806-Respect-saving-disabled-before-unloading-all-.patch
new file mode 100644
index 000000000..fa49d33f4
--- /dev/null
+++ b/Spigot-Server-Patches/GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Thu, 27 Jul 2017 00:06:43 -0400
+Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
+ in a world
+
+This behavior causes a save to occur even though saving was supposed to be turned off.
+
+It's triggered when Hell/End worlds are empty of players.
+
+diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
+index 14ea89c91..08e0cdf6d 100644
+--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
++++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
+@@ -0,0 +0,0 @@ public class PlayerChunkMap {
+             try (Timing ignored = world.timings.doChunkMapUnloadChunks.startTiming()) { // Paper
+             WorldProvider worldprovider = this.world.worldProvider;
+ 
+-            if (!worldprovider.e()) {
++            if (!worldprovider.e() && !this.world.savingDisabled) { // Paper - respect saving disabled setting
+                 this.world.getChunkProviderServer().b();
+             }
+             } // Paper timing
+--
\ No newline at end of file