diff --git a/components/detournavigator/asyncnavmeshupdater.cpp b/components/detournavigator/asyncnavmeshupdater.cpp
index 48860c33d..d5b6d380f 100644
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@@ -45,12 +45,16 @@ namespace DetourNavigator
         const std::shared_ptr<NavMeshCacheItem>& navMeshCacheItem, const TilePosition& playerTile,
         const std::set<TilePosition>& changedTiles)
     {
+        setRecastMesh(recastMesh);
+
+        if (changedTiles.empty())
+            return;
+
         const std::lock_guard<std::mutex> lock(mMutex);
+
         for (const auto& changedTile : changedTiles)
-        {
-            mJobs.push(Job {agentHalfExtents, recastMesh, navMeshCacheItem, changedTile,
-                            makePriority(changedTile, playerTile)});
-        }
+            mJobs.push(Job {agentHalfExtents, navMeshCacheItem, changedTile, makePriority(changedTile, playerTile)});
+
         mHasJob.notify_all();
     }
 
@@ -85,12 +89,14 @@ namespace DetourNavigator
 
         const auto start = std::chrono::steady_clock::now();
 
-        updateNavMesh(job.mAgentHalfExtents, *job.mRecastMesh, job.mChangedTile, mSettings,
+        const auto recastMesh = getRecastMesh();
+
+        updateNavMesh(job.mAgentHalfExtents, *recastMesh, job.mChangedTile, mSettings,
             job.mNavMeshCacheItem->mValue);
 
         const auto finish = std::chrono::steady_clock::now();
 
-        writeDebugFiles(job);
+        writeDebugFiles(job, *recastMesh);
 
         using FloatMs = std::chrono::duration<float, std::milli>;
 
@@ -114,7 +120,7 @@ namespace DetourNavigator
         return job;
     }
 
-    void AsyncNavMeshUpdater::writeDebugFiles(const Job& job) const
+    void AsyncNavMeshUpdater::writeDebugFiles(const Job& job, const RecastMesh& recastMesh) const
     {
         std::string revision;
         std::string recastMeshRevision;
@@ -130,8 +136,20 @@ namespace DetourNavigator
                 navMeshRevision = revision;
         }
         if (mSettings.get().mEnableWriteRecastMeshToFile)
-            writeToFile(*job.mRecastMesh, mSettings.get().mRecastMeshPathPrefix, recastMeshRevision);
+            writeToFile(recastMesh, mSettings.get().mRecastMeshPathPrefix, recastMeshRevision);
         if (mSettings.get().mEnableWriteNavMeshToFile)
             writeToFile(*job.mNavMeshCacheItem->mValue.lock(), mSettings.get().mNavMeshPathPrefix, navMeshRevision);
     }
+
+    std::shared_ptr<RecastMesh> AsyncNavMeshUpdater::getRecastMesh()
+    {
+        const std::lock_guard<std::mutex> lock(mRecastMeshMutex);
+        return mRecastMesh;
+    }
+
+    void AsyncNavMeshUpdater::setRecastMesh(const std::shared_ptr<RecastMesh>& value)
+    {
+        const std::lock_guard<std::mutex> lock(mRecastMeshMutex);
+        mRecastMesh = value;
+    }
 }
diff --git a/components/detournavigator/asyncnavmeshupdater.hpp b/components/detournavigator/asyncnavmeshupdater.hpp
index a9432ceaf..8a70278fb 100644
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@@ -44,7 +44,6 @@ namespace DetourNavigator
         struct Job
         {
             osg::Vec3f mAgentHalfExtents;
-            std::shared_ptr<RecastMesh> mRecastMesh;
             std::shared_ptr<NavMeshCacheItem> mNavMeshCacheItem;
             TilePosition mChangedTile;
             std::pair<int, int> mPriority;
@@ -63,6 +62,8 @@ namespace DetourNavigator
         std::condition_variable mHasJob;
         std::condition_variable mDone;
         Jobs mJobs;
+        std::mutex mRecastMeshMutex;
+        std::shared_ptr<RecastMesh> mRecastMesh;
         std::thread mThread;
 
         void process() throw();
@@ -73,7 +74,11 @@ namespace DetourNavigator
 
         void notifyHasJob();
 
-        void writeDebugFiles(const Job& job) const;
+        void writeDebugFiles(const Job& job, const RecastMesh& recastMesh) const;
+
+        std::shared_ptr<RecastMesh> getRecastMesh();
+
+        void setRecastMesh(const std::shared_ptr<RecastMesh>& value);
     };
 }