diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
index e1fe6ea89..6038cce1a 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
@@ -56,7 +56,7 @@ public AStarNavigationStrategy(NPC npc, Location dest, NavigatorParameters param
 
     @Override
     public Location getCurrentDestination() {
-        return plan != null ? plan.getCurrentVector().toLocation(npc.getEntity().getWorld()) : destination.clone();
+        return vector != null ? vector.toLocation(npc.getEntity().getWorld()) : destination.clone();
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
index 3d4f11639..66ea346f9 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
@@ -58,7 +58,7 @@ public FlyingAStarNavigationStrategy(final NPC npc, Location dest, NavigatorPara
 
     @Override
     public Location getCurrentDestination() {
-        return vector != null ? vector.toLocation(npc.getEntity().getWorld()) : null;
+        return vector != null ? vector.toLocation(npc.getEntity().getWorld()) : target.clone();
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
index d3c3a0e69..8902b6b55 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
@@ -45,7 +45,8 @@ public class MCNavigationStrategy extends AbstractPathStrategy {
 
     @Override
     public Location getCurrentDestination() {
-        return NMS.getDestination(entity);
+        Location dest = NMS.getDestination(entity);
+        return dest != null ? dest : target.clone();
     }
 
     @Override