diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index 9a6daff481..f7438b9c7c 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -37,6 +37,11 @@ public class EntityChicken extends EntityAnimal {
     }
 
     public void e() {
+        // CraftBukkit start
+        if (this.bZ()) { // should be isChickenJockey
+            this.persistent = !this.isTypeNotPersistent();
+        }
+        // CraftBukkit end
         super.e();
         this.bs = this.bp;
         this.br = this.bq;