diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 9f8658ff8..9d48f5db3 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -326,6 +326,8 @@ public class CitizensNPC extends AbstractNPC {
     @Override
     public void teleport(Location location, TeleportCause reason) {
         super.teleport(location, reason);
+        if (!isSpawned())
+            return;
         Location npcLoc = getEntity().getLocation(CACHE_LOCATION);
         if (isSpawned() && npcLoc.getWorld() == location.getWorld() && npcLoc.distanceSquared(location) < 1) {
             NMS.setHeadYaw(getEntity(), location.getYaw());