diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 982d5970e..4151afe0c 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -84,6 +84,11 @@ public class CitizensNPC extends AbstractNPC {
         return navigator;
     }
 
+    @Override
+    public Location getStoredLocation() {
+        return isSpawned() ? getBukkitEntity().getLocation() : getTrait(CurrentLocation.class).getLocation();
+    }
+
     @Override
     public boolean isSpawned() {
         return getBukkitEntity() != null;