diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 00e1c9c3a8..214aad320b 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -114,7 +114,7 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
             if (wasShortcutting || doesPathNeedRecalc(dest, actor)) // if need to rebuild path
             {
                 const auto pathfindingHalfExtents = world->getPathfindingHalfExtents(actor);
-                mPathFinder.buildPath(actor, position, dest, actor.getCell(), getPathGridGraph(actor.getCell()),
+                mPathFinder.buildLimitedPath(actor, position, dest, actor.getCell(), getPathGridGraph(actor.getCell()),
                     pathfindingHalfExtents, getNavigatorFlags(actor), getAreaCosts(actor));
                 mRotateOnTheRunChecks = 3;
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 93ae90547c..781b897a73 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -442,4 +442,21 @@ namespace MWMechanics
 
         std::copy(prePath.rbegin(), prePath.rend(), std::front_inserter(mPath));
     }
+
+    void PathFinder::buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+        const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+        const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts)
+    {
+        const auto navigator = MWBase::Environment::get().getWorld()->getNavigator();
+        const auto maxDistance = std::min(
+            navigator->getMaxNavmeshAreaRealRadius(),
+            static_cast<float>(Constants::CellSizeInUnits)
+        );
+        const auto startToEnd = endPoint - startPoint;
+        const auto distance = startToEnd.length();
+        if (distance <= maxDistance)
+            return buildPath(actor, startPoint, endPoint, cell, pathgridGraph, halfExtents, flags, areaCosts);
+        const auto end = startPoint + startToEnd * maxDistance / distance;
+        buildPath(actor, startPoint, end, cell, pathgridGraph, halfExtents, flags, areaCosts);
+    }
 }
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index b5c376b8ca..ed88a57ca0 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -101,6 +101,10 @@ namespace MWMechanics
             void buildPathByNavMeshToNextPoint(const MWWorld::ConstPtr& actor, const osg::Vec3f& halfExtents,
                 const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
 
+            void buildLimitedPath(const MWWorld::ConstPtr& actor, const osg::Vec3f& startPoint, const osg::Vec3f& endPoint,
+                const MWWorld::CellStore* cell, const PathgridGraph& pathgridGraph, const osg::Vec3f& halfExtents,
+                const DetourNavigator::Flags flags, const DetourNavigator::AreaCosts& areaCosts);
+
             /// Remove front point if exist and within tolerance
             void update(const osg::Vec3f& position, float pointTolerance, float destinationTolerance,
                         bool shortenIfAlmostStraight, bool canMoveByZ);
diff --git a/components/detournavigator/navigator.hpp b/components/detournavigator/navigator.hpp
index ef61f78c68..d08bfa640f 100644
--- a/components/detournavigator/navigator.hpp
+++ b/components/detournavigator/navigator.hpp
@@ -235,6 +235,8 @@ namespace DetourNavigator
             const osg::Vec3f& end, const Flags includeFlags) const;
 
         virtual RecastMeshTiles getRecastMeshTiles() = 0;
+
+        virtual float getMaxNavmeshAreaRealRadius() const = 0;
     };
 }
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index 142ba590d2..abfb20ba80 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -213,4 +213,10 @@ namespace DetourNavigator
                 ++it;
         }
     }
+
+    float NavigatorImpl::getMaxNavmeshAreaRealRadius() const
+    {
+        const auto& settings = getSettings();
+        return getRealTileSize(settings) * getMaxNavmeshAreaRadius(settings);
+    }
 }
diff --git a/components/detournavigator/navigatorimpl.hpp b/components/detournavigator/navigatorimpl.hpp
index e197c71b78..74fff0dea4 100644
--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@@ -60,6 +60,8 @@ namespace DetourNavigator
 
         RecastMeshTiles getRecastMeshTiles() override;
 
+        float getMaxNavmeshAreaRealRadius() const override;
+
     private:
         Settings mSettings;
         NavMeshManager mNavMeshManager;
diff --git a/components/detournavigator/navigatorstub.hpp b/components/detournavigator/navigatorstub.hpp
index f1f9e06ef3..f6892bf1b5 100644
--- a/components/detournavigator/navigatorstub.hpp
+++ b/components/detournavigator/navigatorstub.hpp
@@ -92,6 +92,11 @@ namespace DetourNavigator
             return {};
         }
 
+        float getMaxNavmeshAreaRealRadius() const override
+        {
+            return std::numeric_limits<float>::max();
+        }
+
     private:
         Settings mDefaultSettings {};
         SharedNavMeshCacheItem mEmptyNavMeshCacheItem;
diff --git a/components/detournavigator/settingsutils.hpp b/components/detournavigator/settingsutils.hpp
index 39ffc03d19..8f1c96e286 100644
--- a/components/detournavigator/settingsutils.hpp
+++ b/components/detournavigator/settingsutils.hpp
@@ -1,4 +1,4 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGSUTILS_H
+#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGSUTILS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_SETTINGSUTILS_H
 
 #include "settings.hpp"
@@ -89,6 +89,16 @@ namespace DetourNavigator
             transform.getOrigin() + btVector3(0, 0, getSwimLevel(settings, agentHalfExtentsZ) - agentHalfExtentsZ)
         );
     }
+
+    inline float getRealTileSize(const Settings& settings)
+    {
+        return settings.mTileSize * settings.mCellSize / settings.mRecastScaleFactor;
+    }
+
+    inline float getMaxNavmeshAreaRadius(const Settings& settings)
+    {
+        return std::floor(std::sqrt(settings.mMaxTilesNumber / osg::PI)) - 1;
+    }
 }
 
 #endif