diff --git a/nms-patches/EntityFish.patch b/nms-patches/EntityFish.patch
new file mode 100644
index 0000000000..9773a887c7
--- /dev/null
+++ b/nms-patches/EntityFish.patch
@@ -0,0 +1,10 @@
+--- a/net/minecraft/server/EntityFish.java
++++ b/net/minecraft/server/EntityFish.java
+@@ -67,6 +67,7 @@
+ 
+     public void s(boolean flag) {
+         this.datawatcher.set(EntityFish.b, Boolean.valueOf(flag));
++        this.persistent = !this.isTypeNotPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
+     }
+ 
+     public void b(NBTTagCompound nbttagcompound) {