1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Maps/DynamicMMapTileBuilder.cpp b/src/server/game/Maps/DynamicMMapTileBuilder.cpp
index 47e10743ee2..be2a1e7fd2b 100644
--- a/src/server/game/Maps/DynamicMMapTileBuilder.cpp
+++ b/src/server/game/Maps/DynamicMMapTileBuilder.cpp
@@ -163,13 +163,16 @@ struct TileCache
 private:
     void OnCacheCleanupTimerTick(boost::system::error_code const& error)
     {
-        if (error || !_builderThread.joinable() /*shutting down*/)
-            return;
-
         TimePoint now = GameTime::Now();
         RemoveOldCacheEntries(now - CACHE_MAX_AGE);
         _cacheCleanupTimer.expires_at(now + CACHE_CLEANUP_INTERVAL);
-        _cacheCleanupTimer.async_wait([this](boost::system::error_code const& error) { OnCacheCleanupTimerTick(error); });
+        _cacheCleanupTimer.async_wait([this](boost::system::error_code const& error)
+        {
+            if (error || !_builderThread.joinable() /*shutting down*/)
+                return;
+
+            OnCacheCleanupTimerTick(error);
+        });
     }
 
     void RemoveOldCacheEntries(TimePoint oldestPreservedEntryTimestamp)