--- 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.isPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
     }
 
     public void b(NBTTagCompound nbttagcompound) {