diff --git a/patches/server/Fix-chicken-jockey-persistence.patch b/patches/server/Fix-chicken-jockey-persistence.patch
new file mode 100644
index 000000000..8e2a65182
--- /dev/null
+++ b/patches/server/Fix-chicken-jockey-persistence.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Sat, 26 Jun 2021 10:43:53 +0200
+Subject: [PATCH] Fix chicken jockey persistence
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+@@ -0,0 +0,0 @@ public class Chicken extends Animal {
+     public void aiStep() {
+         // CraftBukkit start
+         if (this.isChickenJockey()) {
+-            this.persistenceRequired = !this.removeWhenFarAway(0);
++            ((Mob) this).persistenceRequired = !this.removeWhenFarAway(0); // Paper - fix remap by explicitly casting to Mob
+         }
+         // CraftBukkit end
+         super.aiStep();