diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp
index 9c7adfcefc..70433dd23d 100644
--- a/indexer/mwm_set.cpp
+++ b/indexer/mwm_set.cpp
@@ -31,6 +31,12 @@ MwmInfo::MwmTypeT MwmInfo::GetType() const
   return COASTS;
 }
 
+bool MwmSet::MwmId::IsDeregistered(platform::LocalCountryFile const & deregisteredCountryFile) const
+{
+  return m_info && m_info->GetStatus() == MwmInfo::STATUS_DEREGISTERED &&
+    m_info->GetLocalFile() == deregisteredCountryFile;
+}
+
 string DebugPrint(MwmSet::MwmId const & id)
 {
   ostringstream ss;
diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp
index 2fa3a86f8d..d2740e966c 100644
--- a/indexer/mwm_set.hpp
+++ b/indexer/mwm_set.hpp
@@ -119,6 +119,8 @@ public:
 
     void Reset() { m_info.reset(); }
     bool IsAlive() const { return (m_info && m_info->GetStatus() != MwmInfo::STATUS_DEREGISTERED); }
+    bool IsDeregistered(platform::LocalCountryFile const & deregisteredCountryFile) const;
+
     shared_ptr<MwmInfo> & GetInfo() { return m_info; }
     shared_ptr<MwmInfo> const & GetInfo() const { return m_info; }
 
diff --git a/map/framework.cpp b/map/framework.cpp
index e958a697e4..53ff0f0efd 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -606,13 +606,8 @@ bool Framework::OnCountryFileDelete(storage::TCountryId const & countryId, stora
   if (localFile)
   {
     rect = m_infoGetter->GetLimitRectForLeaf(countryId);
-    auto const mwmId = m_model.GetDataSource().GetMwmIdByCountryFile(localFile->GetCountryFile());
     m_model.DeregisterMap(platform::CountryFile(countryId));
     deferredDelete = true;
-    // Notify managers in case of mwm deletion.
-    m_localAdsManager.OnMwmDeregistered(mwmId);
-    m_transitManager.OnMwmDeregistered(mwmId);
-    m_trafficManager.OnMwmDeregistered(mwmId);
   }
   InvalidateRect(rect);
 
@@ -622,20 +617,15 @@ bool Framework::OnCountryFileDelete(storage::TCountryId const & countryId, stora
 
 void Framework::OnMapDeregistered(platform::LocalCountryFile const & localFile)
 {
+  m_localAdsManager.OnMwmDeregistered(localFile);
+  m_transitManager.OnMwmDeregistered(localFile);
+  m_trafficManager.OnMwmDeregistered(localFile);
+
   auto action = [this, localFile]
   {
     m_storage.DeleteCustomCountryVersion(localFile);
   };
 
-  auto const mwmId = m_model.GetDataSource().GetMwmIdByCountryFile(localFile.GetCountryFile());
-  if (mwmId.GetInfo())
-  {
-    // Notify managers in case of mwm updating.
-    m_localAdsManager.OnMwmDeregistered(mwmId);
-    m_transitManager.OnMwmDeregistered(mwmId);
-    m_trafficManager.OnMwmDeregistered(mwmId);
-  }
-
   // Call action on thread in which the framework was created
   // For more information look at comment for Observer class in mwm_set.hpp
   if (m_storage.GetThreadChecker().CalledOnOriginalThread())
diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp
index 070b491b57..8079371dda 100644
--- a/map/local_ads_manager.cpp
+++ b/map/local_ads_manager.cpp
@@ -505,8 +505,22 @@ void LocalAdsManager::OnDownloadCountry(std::string const & countryName)
   });
 }
 
-void LocalAdsManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
+void LocalAdsManager::OnMwmDeregistered(platform::LocalCountryFile const & countryFile)
 {
+  MwmSet::MwmId mwmId;
+  {
+    std::lock_guard<std::mutex> lock(m_featuresCacheMutex);
+    for (auto const & cachedMwm : m_featuresCache)
+    {
+      if (cachedMwm.first.m_mwmId.IsDeregistered(countryFile))
+      {
+        mwmId = cachedMwm.first.m_mwmId;
+        break;
+      }
+    }
+  }
+  if (!mwmId.GetInfo())
+    return;
   GetPlatform().RunTask(Platform::Thread::File, [this, mwmId]
   {
     ProcessRequests({std::make_pair(mwmId, RequestType::Delete)});
diff --git a/map/local_ads_manager.hpp b/map/local_ads_manager.hpp
index 3ff9ca80e4..de990958d4 100644
--- a/map/local_ads_manager.hpp
+++ b/map/local_ads_manager.hpp
@@ -52,7 +52,7 @@ public:
   void UpdateViewport(ScreenBase const & screen);
 
   void OnDownloadCountry(std::string const & countryName);
-  void OnMwmDeregistered(MwmSet::MwmId const & mwmId);
+  void OnMwmDeregistered(platform::LocalCountryFile const & countryFile);
 
   void Invalidate();
 
diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp
index ee86e25dad..0792c4c1e4 100644
--- a/map/traffic_manager.cpp
+++ b/map/traffic_manager.cpp
@@ -140,13 +140,24 @@ void TrafficManager::SetCurrentDataVersion(int64_t dataVersion)
   m_currentDataVersion = dataVersion;
 }
 
-void TrafficManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
+void TrafficManager::OnMwmDeregistered(platform::LocalCountryFile const & countryFile)
 {
   if (!IsEnabled())
     return;
 
   {
     lock_guard<mutex> lock(m_mutex);
+
+    MwmSet::MwmId mwmId;
+    for (auto const & cacheEntry : m_mwmCache)
+    {
+      if (cacheEntry.first.IsDeregistered(countryFile))
+      {
+        mwmId = cacheEntry.first;
+        break;
+      }
+    }
+
     ClearCache(mwmId);
   }
 }
diff --git a/map/traffic_manager.hpp b/map/traffic_manager.hpp
index cfb7104168..18069dcaf4 100644
--- a/map/traffic_manager.hpp
+++ b/map/traffic_manager.hpp
@@ -76,7 +76,7 @@ public:
 
   void OnDestroyGLContext();
   void OnRecoverGLContext();
-  void OnMwmDeregistered(MwmSet::MwmId const & mwmId);
+  void OnMwmDeregistered(platform::LocalCountryFile const & countryFile);
 
   void OnEnterForeground();
   void OnEnterBackground();
diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp
index 79b5a5a25b..012ab22bc1 100644
--- a/map/transit/transit_reader.cpp
+++ b/map/transit/transit_reader.cpp
@@ -308,8 +308,17 @@ void TransitReadManager::ClearCache(MwmSet::MwmId const & mwmId)
   m_drapeEngine.SafeCall(&df::DrapeEngine::ClearTransitSchemeCache, mwmId);
 }
 
-void TransitReadManager::OnMwmDeregistered(MwmSet::MwmId const & mwmId)
+void TransitReadManager::OnMwmDeregistered(platform::LocalCountryFile const & countryFile)
 {
+  MwmSet::MwmId mwmId;
+  for (auto const & cacheEntry : m_mwmCache)
+  {
+    if (cacheEntry.first.IsDeregistered(countryFile))
+    {
+      mwmId = cacheEntry.first;
+      break;
+    }
+  }
   ClearCache(mwmId);
 }
 
diff --git a/map/transit/transit_reader.hpp b/map/transit/transit_reader.hpp
index 5242657d72..34459da2ca 100644
--- a/map/transit/transit_reader.hpp
+++ b/map/transit/transit_reader.hpp
@@ -104,7 +104,7 @@ public:
   void EnableTransitSchemeMode(bool enable);
   void BlockTransitSchemeMode(bool isBlocked);
   void UpdateViewport(ScreenBase const & screen);
-  void OnMwmDeregistered(MwmSet::MwmId const & mwmId);
+  void OnMwmDeregistered(platform::LocalCountryFile const & countryFile);
   void Invalidate();
 
 private: