diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 8a6df02612..2b66a08ade 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -149,6 +149,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
         getHandle().setBasePlate(!basePlate);
     }
 
+    @Override
+    public void setGravity(boolean gravity) {
+        super.setGravity(gravity);
+        // Armor stands are special
+        getHandle().noclip = !gravity;
+    }
+
     @Override
     public boolean isVisible() {
         return !getHandle().isInvisible();