diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 8503d5d6f..09e06e51f 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -137,7 +137,7 @@ public class CitizensNPC extends AbstractNPC {
 
     @Override
     public Location getStoredLocation() {
-        return isSpawned() ? getEntity().getLocation(CACHE_LOCATION) : getTrait(CurrentLocation.class).getLocation();
+        return isSpawned() ? getEntity().getLocation() : getTrait(CurrentLocation.class).getLocation();
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java b/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
index 4451ab185..3c22dc18f 100644
--- a/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
+++ b/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
@@ -27,7 +27,7 @@ public class CurrentLocation extends Trait {
     }
 
     public Location getLocation() {
-        return location.getWorld() == null ? null : location;
+        return location.getWorld() == null ? null : location.clone();
     }
 
     @Override