--- a/net/minecraft/world/entity/animal/EntityFish.java
+++ b/net/minecraft/world/entity/animal/EntityFish.java
@@ -59,7 +59,7 @@
 
     @Override
     public boolean removeWhenFarAway(double d0) {
-        return !this.fromBucket() && !this.hasCustomName();
+        return true; // CraftBukkit
     }
 
     @Override
@@ -81,6 +81,7 @@
     @Override
     public void setFromBucket(boolean flag) {
         this.entityData.set(EntityFish.FROM_BUCKET, flag);
+        this.setPersistenceRequired(this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence
     }
 
     @Override