diff --git a/patches/server/Correctly-handle-ArmorStand-invisibility.patch b/patches/server/Correctly-handle-ArmorStand-invisibility.patch
new file mode 100644
index 0000000000..5f5dcefad2
--- /dev/null
+++ b/patches/server/Correctly-handle-ArmorStand-invisibility.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sun, 5 Mar 2023 14:38:21 -0800
+Subject: [PATCH] Correctly handle ArmorStand invisibility
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+@@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+         this.getHandle().noPhysics = !gravity;
+     }
+ 
++    // Paper start - Armor Stand has its own invisible field
++    @Override
++    public void setInvisible(final boolean invisible) {
++        this.getHandle().setInvisible(invisible);
++        super.setInvisible(invisible);
++    }
++    // Paper end
++
+     @Override
+     public boolean isVisible() {
+         return !this.getHandle().isInvisible();