diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
index 966e112c4d..4b17ddd12d 100644
--- a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
+++ b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -32,16 +32,17 @@
 public class HealthTrait extends Trait implements Listener {
 
     // Saved to the C2 saves.yml
-
     @Persist("animatedeath")
     private boolean animatedeath = Settings.HealthTraitAnimatedDeathEnabled();
 
     @Persist("respawnondeath")
     private boolean respawn = Settings.HealthTraitRespawnEnabled();
+
     @Persist("respawndelayinseconds")
-    private String respawnDelay = Settings.HealthTraitRespawnDelay();;
+    private String respawnDelay = Settings.HealthTraitRespawnDelay();
+
     @Persist("respawnlocation")
-    private String respawnLocation = "<npc.location>";
+    private String respawnLocation =  "<npc.flag[respawn_location] || <npc.location>>";
 
     // internal
     private dPlayer player = null;