diff --git a/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index fceabe1e81..e0e5c74adc 100644
--- a/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mark fish and axolotls from buckets as persistent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
-index fc0cd86397b12e42756273a0317164d79ac51937..76cb5ba6023a8d019b5f4c8c2cedbc8e0fd04886 100644
+index fc0cd86397b12e42756273a0317164d79ac51937..0701adf77a04a82df4fe1dceee196fee5d820961 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 @@ -90,7 +90,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
@@ -13,12 +13,12 @@ index fc0cd86397b12e42756273a0317164d79ac51937..76cb5ba6023a8d019b5f4c8c2cedbc8e
      public void setFromBucket(boolean fromBucket) {
          this.entityData.set(AbstractFish.FROM_BUCKET, fromBucket);
 -        this.setPersistenceRequired(this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence
-+        this.setPersistenceRequired(fromBucket); // CraftBukkit - SPIGOT-4106 update persistence // Paper - actually set as persistent
++        this.setPersistenceRequired(fromBucket || this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence // Paper - actually set as persistent
      }
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index fa365420a4593bc7d652b0d92f4750602fcb334b..d041e6f9c01549bb15f3d68ff1fd3bcc3458482b 100644
+index fa365420a4593bc7d652b0d92f4750602fcb334b..0c616bd9309d304727a29ff5cb1c60d9f031b34c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -236,7 +236,7 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -26,7 +26,7 @@ index fa365420a4593bc7d652b0d92f4750602fcb334b..d041e6f9c01549bb15f3d68ff1fd3bcc
      public void setFromBucket(boolean fromBucket) {
          this.entityData.set(Axolotl.FROM_BUCKET, fromBucket);
 -        this.setPersistenceRequired(this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence
-+        this.setPersistenceRequired(fromBucket); // CraftBukkit - SPIGOT-4106 update persistence // Paper - actually set as persistent
++        this.setPersistenceRequired(fromBucket || this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence // Paper - actually set as persistent
      }
  
      @Nullable