diff --git a/paper-server/patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
index 55f173760b5f..4fae2904e9e1 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/decoration/ArmorStand.java.patch
@@ -242,7 +242,7 @@
      }
  
      private void playBrokenSound() {
-@@ -459,7 +_,32 @@
+@@ -459,7 +_,38 @@
          return this.isSmall();
      }
  
@@ -256,6 +256,12 @@
 +                this.detectEquipmentUpdates();
 +            }
 +
++            // Still tick for death, otherwise leaves permanent entities
++            // Same logic as LivingEntity#baseTick
++            if (this.isDeadOrDying() && this.level().shouldTickDeath(this)) {
++                this.tickDeath();
++            }
++
 +            return;
 +        }
 +        super.tick();