diff --git a/patches/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch
new file mode 100644
index 0000000000..6da09c8055
--- /dev/null
+++ b/patches/server/Mark-fish-and-axolotls-from-buckets-as-persistent.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Fri, 13 Aug 2021 16:38:08 -0700
+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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
++++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
+@@ -0,0 +0,0 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+     @Override
+     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
+     }
+ 
+     @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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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
+@@ -0,0 +0,0 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
+     @Override
+     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
+     }
+ 
+     @Nullable