--- a/net/minecraft/server/EntityFish.java
+++ b/net/minecraft/server/EntityFish.java
@@ -34,7 +34,7 @@
 
     @Override
     public boolean isTypeNotPersistent(double d0) {
-        return !this.isFromBucket() && !this.hasCustomName();
+        return true; // CraftBukkit
     }
 
     @Override
@@ -54,6 +54,7 @@
 
     public void setFromBucket(boolean flag) {
         this.datawatcher.set(EntityFish.FROM_BUCKET, flag);
+        this.persistent = this.isPersistent(); // CraftBukkit - SPIGOT-4106 update persistence
     }
 
     @Override
