diff --git a/patches/server/0254-Mob-Pathfinding-API.patch b/patches/server/0254-Mob-Pathfinding-API.patch
index f08afb6752..3021c06d6e 100644
--- a/patches/server/0254-Mob-Pathfinding-API.patch
+++ b/patches/server/0254-Mob-Pathfinding-API.patch
@@ -12,7 +12,7 @@ public net.minecraft.world.level.pathfinder.Path nodes
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7ba7add6475ff8d238897398c26de24de52c4cfd
+index 0000000000000000000000000000000000000000..064712e7b27a200b29c72076a82f4f5611fa507f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,143 @@
@@ -54,14 +54,14 @@ index 0000000000000000000000000000000000000000..7ba7add6475ff8d238897398c26de24d
 +
 +    @Override
 +    public boolean hasPath() {
-+        return entity.getNavigation().getPath() != null;
++        return entity.getNavigation().getPath() != null && !entity.getNavigation().getPath().isDone();
 +    }
 +
 +    @Nullable
 +    @Override
 +    public PathResult getCurrentPath() {
 +        Path path = entity.getNavigation().getPath();
-+        return path != null ? new PaperPathResult(path) : null;
++        return path != null && !path.isDone() ? new PaperPathResult(path) : null;
 +    }
 +
 +    @Nullable