diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index c8713200d9..184fe8257e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -152,6 +152,14 @@ 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();