diff --git a/nms-patches/EntityFish.patch b/nms-patches/EntityFish.patch
index c4b05830e3..0fe7401b08 100644
--- a/nms-patches/EntityFish.patch
+++ b/nms-patches/EntityFish.patch
@@ -1,10 +1,19 @@
 --- a/net/minecraft/server/EntityFish.java
 +++ b/net/minecraft/server/EntityFish.java
+@@ -37,7 +37,7 @@
+     }
+ 
+     protected boolean isTypeNotPersistent() {
+-        return !this.isFromBucket() && !this.hasCustomName();
++        return true; // CraftBukkit
+     }
+ 
+     public boolean l() {
 @@ -71,6 +71,7 @@
  
      public void setFromBucket(boolean flag) {
          this.datawatcher.set(EntityFish.b, Boolean.valueOf(flag));
-+        this.persistent = !this.isTypeNotPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
++        this.persistent = this.isPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
      }
  
      public void b(NBTTagCompound nbttagcompound) {