diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
index 11e6fdb..cf59d75 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
@@ -274,6 +274,13 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
             register(new BitsetProperty("is_retracting_spikes", guardianIndex++, 0x02, false, legacyBooleans));
             linkProperties("is_elder", "is_retracting_spikes");
             // TODO: add guardian beam target
+        } else {
+            int guardianIndex;
+            if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) guardianIndex = 16;
+            else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) guardianIndex = 15;
+            else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) guardianIndex = 14;
+            else guardianIndex = 12;
+            register(new BooleanProperty("is_retracting_spikes", guardianIndex, false, false));
         }
 
         // Horse
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java
index 3a4527e..e7ff2a1 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java
@@ -161,6 +161,9 @@ public class NpcTypeImpl implements NpcType {
             if (EntityTypes.isTypeInstanceOf(type, EntityTypes.ABSTRACT_TAMEABLE_ANIMAL)) {
                 addProperties("tamed", "sitting");
             }
+            if (EntityTypes.isTypeInstanceOf(type, EntityTypes.GUARDIAN)) {
+                addProperties("is_retracting_spikes");
+            }
             return new NpcTypeImpl(name, type, hologramOffset, new HashSet<>(allowedProperties), defaultProperties);
         }
     }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
index 5e8bb6f..2cc382f 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
@@ -97,7 +97,7 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
 
         register(builder(p, "guardian", EntityTypes.GUARDIAN)
                 .setHologramOffset(-1.125)
-                .addProperties("is_elder", "is_retracting_spikes"));
+                .addProperties("is_elder"));
 
         register(builder(p, "horse", EntityTypes.HORSE)
                 .setHologramOffset(-0.375)