diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 68169bae9e..82bb12966d 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -176,7 +176,9 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
         mTimer = 0;
     }
 
-    mPathFinder.update(position, std::max(destTolerance, DEFAULT_TOLERANCE));
+    const auto pointTolerance = std::min(actor.getClass().getSpeed(actor), DEFAULT_TOLERANCE);
+
+    mPathFinder.update(position, pointTolerance, destTolerance);
 
     if (isDestReached || mPathFinder.checkPathCompleted()) // if path is finished
     {
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index ee091de4c3..3759335e5d 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -253,9 +253,14 @@ namespace MWMechanics
         return getXAngleToDir(dir);
     }
 
-    void PathFinder::update(const osg::Vec3f& position, const float tolerance)
+    void PathFinder::update(const osg::Vec3f& position, const float pointTolerance, const float destinationTolerance)
     {
-        if (!mPath.empty() && sqrDistanceIgnoreZ(mPath.front(), position) < tolerance*tolerance)
+        if (mPath.empty())
+            return;
+
+        const auto tolerance = mPath.size() > 1 ? pointTolerance : destinationTolerance;
+
+        if (sqrDistanceIgnoreZ(mPath.front(), position) < tolerance * tolerance)
             mPath.pop_front();
     }
 
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 543305ff62..1a35ef792e 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -79,7 +79,7 @@ namespace MWMechanics
                 const DetourNavigator::Flags flags);
 
             /// Remove front point if exist and within tolerance
-            void update(const osg::Vec3f& position, const float tolerance = DEFAULT_TOLERANCE);
+            void update(const osg::Vec3f& position, const float pointTolerance, const float destinationTolerance);
 
             bool checkPathCompleted() const
             {