diff --git a/src/main/java/lol/pyr/znpcsplus/npc/NPC.java b/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
index 1a8c298..0518fc3 100644
--- a/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
+++ b/src/main/java/lol/pyr/znpcsplus/npc/NPC.java
@@ -117,11 +117,15 @@ public class NPC {
 
     public <T> void setProperty(NPCProperty<T> key, T value) {
         if (value.equals(key.getDefaultValue())) removeProperty(key);
-        else propertyMap.put(key, value);
+        else {
+            propertyMap.put(key, value);
+            respawn();
+        }
     }
 
     public void removeProperty(NPCProperty<?> key) {
         propertyMap.remove(key);
+        respawn();
     }
 
     public Collection<NPCAction> getActions() {