diff --git a/Spigot-Server-Patches/0339-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0339-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
new file mode 100644
index 0000000000..bbf41e099b
--- /dev/null
+++ b/Spigot-Server-Patches/0339-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -0,0 +1,30 @@
+From 37c0cfe11574838ad8c24863a4b926e0b88878d5 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 23 Jul 2018 22:18:31 -0400
+Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
+ saves
+
+
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index b31c301ec..6de053781 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -683,6 +683,7 @@ public class Chunk {
+         entity.ad = this.locZ;
+         this.entitySlices[k].add(entity);
+         // Paper start
++        this.markDirty();
+         entity.setCurrentChunk(this);
+         entityCounts.increment(entity.entityKeyString);
+         if (entity instanceof EntityItem) {
+@@ -725,6 +726,7 @@ public class Chunk {
+ 
+         // Paper start
+         if (!this.entitySlices[i].remove(entity)) { return; }
++        this.markDirty();
+         entity.setCurrentChunk(null);
+         entityCounts.decrement(entity.entityKeyString);
+         if (entity instanceof EntityItem) {
+-- 
+2.18.0
+