diff --git a/Spigot-Server-Patches/Don-t-update-snapshot-blockstates.patch b/Spigot-Server-Patches/Don-t-update-snapshot-blockstates.patch
new file mode 100644
index 0000000000..bf9ec56ada
--- /dev/null
+++ b/Spigot-Server-Patches/Don-t-update-snapshot-blockstates.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matthew Miller <mnmiller1@me.com>
+Date: Fri, 5 Oct 2018 15:46:46 +1000
+Subject: [PATCH] Don't update snapshot blockstates
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+index d4d9c5fc..f5c6dbd8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+@@ -0,0 +0,0 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
+             TileEntity tile = getTileEntityFromWorld();
+ 
+             if (isApplicable(tile)) {
+-                applyTo(tileEntityClass.cast(tile));
++                // Paper start
++                if (!snapshotDisabled) {
++                    applyTo(tileEntityClass.cast(tile));
++                }
++                // Paper end
+                 tile.update();
+             }
+         }
+--
\ No newline at end of file