diff --git a/patches/server/0270-Honor-EntityAgeable.ageLock.patch b/patches/server/0270-Honor-EntityAgeable.ageLock.patch
index 369899cfee..2a996fbe5b 100644
--- a/patches/server/0270-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0270-Honor-EntityAgeable.ageLock.patch
@@ -5,14 +5,34 @@ Subject: [PATCH] Honor EntityAgeable.ageLock
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/AgeableMob.java b/src/main/java/net/minecraft/world/entity/AgeableMob.java
-index 123b125a3576903767983c93135086ca7a8ea813..c0780a8714808498390282b7fa1da1f3aacf8e2a 100644
+index 123b125a3576903767983c93135086ca7a8ea813..d165117d62fe8a55d624966e8c4b626c0f52db39 100644
 --- a/src/main/java/net/minecraft/world/entity/AgeableMob.java
 +++ b/src/main/java/net/minecraft/world/entity/AgeableMob.java
 @@ -84,6 +84,7 @@ public abstract class AgeableMob extends PathfinderMob {
      }
  
      public void ageUp(int age, boolean overGrow) {
-+        if (ageLocked) return; // Paper - GH-1459
++        if (this.ageLocked) return; // Paper - GH-1459
          int j = this.getAge();
          int k = j;
  
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+index 93f17997ac3f36d0a72e5d4e85c7e748d615801f..0dca7b0f40af9337bdda75ba40cb064f39723bf8 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+@@ -295,6 +295,7 @@ public class BeehiveBlockEntity extends BlockEntity {
+     }
+ 
+     private static void setBeeReleaseData(int ticks, Bee bee) {
++        if (!bee.ageLocked) { // Paper - respect age lock
+         int j = bee.getAge();
+ 
+         if (j < 0) {
+@@ -302,6 +303,7 @@ public class BeehiveBlockEntity extends BlockEntity {
+         } else if (j > 0) {
+             bee.setAge(Math.max(0, j - ticks));
+         }
++        } // Paper - respect age lock
+ 
+         bee.setInLoveTime(Math.max(0, bee.getInLoveTime() - ticks));
+     }
diff --git a/patches/server/0840-Fix-bees-aging-inside-hives.patch b/patches/server/0840-Fix-bees-aging-inside-hives.patch
new file mode 100644
index 0000000000..f1e629576f
--- /dev/null
+++ b/patches/server/0840-Fix-bees-aging-inside-hives.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sat, 21 Aug 2021 21:54:16 -0700
+Subject: [PATCH] Fix bees aging inside hives
+
+Fixes bees incorrectly being aged up due to upstream's
+resetting the ticks inside hive on a failed release
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+index e5e65bb68a92fffbf765eb140fe1e1ec77059c49..b05ac56823feaf062b1418c9e6dbe4268225f00f 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+@@ -324,7 +324,7 @@ public class BeehiveBlockEntity extends BlockEntity {
+ 
+         for (Iterator iterator = bees.iterator(); iterator.hasNext(); ++tileentitybeehive_hivebee.ticksInHive) {
+             tileentitybeehive_hivebee = (BeehiveBlockEntity.BeeData) iterator.next();
+-            if (tileentitybeehive_hivebee.ticksInHive > tileentitybeehive_hivebee.minOccupationTicks) {
++            if (tileentitybeehive_hivebee.exitTickCounter > tileentitybeehive_hivebee.minOccupationTicks) { // Paper - use exitTickCounter
+                 BeehiveBlockEntity.BeeReleaseStatus tileentitybeehive_releasestatus = tileentitybeehive_hivebee.entityData.getBoolean("HasNectar") ? BeehiveBlockEntity.BeeReleaseStatus.HONEY_DELIVERED : BeehiveBlockEntity.BeeReleaseStatus.BEE_RELEASED;
+ 
+                 if (BeehiveBlockEntity.releaseOccupant(world, pos, state, tileentitybeehive_hivebee, (List) null, tileentitybeehive_releasestatus, flowerPos)) {
+@@ -332,10 +332,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+                     iterator.remove();
+                     // CraftBukkit start
+                 } else {
+-                    tileentitybeehive_hivebee.ticksInHive = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable
++                    tileentitybeehive_hivebee.exitTickCounter = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable // Paper - use exitTickCounter to keep actual bee life
+                     // CraftBukkit end
+                 }
+             }
++            tileentitybeehive_hivebee.exitTickCounter++; // Paper
+         }
+ 
+         if (flag) {
+@@ -424,12 +425,14 @@ public class BeehiveBlockEntity extends BlockEntity {
+ 
+         final CompoundTag entityData;
+         int ticksInHive;
++        int exitTickCounter; // Paper - separate counter for checking if bee should exit to reduce exit attempts
+         final int minOccupationTicks;
+ 
+         BeeData(CompoundTag entityData, int ticksInHive, int minOccupationTicks) {
+             BeehiveBlockEntity.removeIgnoredBeeTags(entityData);
+             this.entityData = entityData;
+             this.ticksInHive = ticksInHive;
++            this.exitTickCounter = ticksInHive; // Paper
+             this.minOccupationTicks = minOccupationTicks;
+         }
+     }