diff --git a/storage/downloader_queue_universal.cpp b/storage/downloader_queue_universal.cpp
index ae4c9f933a..45c6d5f3c2 100644
--- a/storage/downloader_queue_universal.cpp
+++ b/storage/downloader_queue_universal.cpp
@@ -37,7 +37,7 @@ CountryId const & Queue::GetFirstId() const
   return m_queue.front().GetCountryId();
 }
 
-QueuedCountry & Queue::GetFirstCountry()
+QueuedCountry const & Queue::GetFirstCountry() const
 {
   CHECK(!m_queue.empty(), ());
 
diff --git a/storage/downloader_queue_universal.hpp b/storage/downloader_queue_universal.hpp
index ae125ebdae..ba7d2ec77b 100644
--- a/storage/downloader_queue_universal.hpp
+++ b/storage/downloader_queue_universal.hpp
@@ -22,7 +22,7 @@ public:
   void ForEachCountry(ForEachCountryMutable const & fn);
 
   CountryId const & GetFirstId() const;
-  QueuedCountry & GetFirstCountry();
+  QueuedCountry const & GetFirstCountry() const;
   void PopFront();
 
   void Append(QueuedCountry && country)
diff --git a/storage/http_map_files_downloader.cpp b/storage/http_map_files_downloader.cpp
index aee1107aff..b5d2a94298 100644
--- a/storage/http_map_files_downloader.cpp
+++ b/storage/http_map_files_downloader.cpp
@@ -57,9 +57,7 @@ void HttpMapFilesDownloader::Download()
 {
   CHECK_THREAD_CHECKER(m_checker, ());
 
-  auto & queuedCountry = m_queue.GetFirstCountry();
-    
-  queuedCountry.ClarifyDownloadingType();
+  auto const & queuedCountry = m_queue.GetFirstCountry();
 
   auto const urls = MakeUrlList(queuedCountry.GetRelativeUrl());
   auto const path = queuedCountry.GetFileDownloadPath();
diff --git a/storage/queued_country.cpp b/storage/queued_country.cpp
index 92d5bf8605..bafc1ba99d 100644
--- a/storage/queued_country.cpp
+++ b/storage/queued_country.cpp
@@ -92,19 +92,6 @@ uint64_t QueuedCountry::GetDownloadSize() const
   return GetRemoteSize(*m_diffsDataSource, m_countryFile);
 }
 
-void QueuedCountry::ClarifyDownloadingType()
-{
-  if (m_fileType != MapFileType::Diff)
-    return;
-
-  using diffs::Status;
-  auto const status = m_diffsDataSource->GetStatus();
-  if (status == Status::NotAvailable || !m_diffsDataSource->HasDiffFor(m_countryId))
-  {
-    m_fileType = MapFileType::Map;
-  }
-}
-
 void QueuedCountry::OnCountryInQueue() const
 {
   if (m_subscriber != nullptr)
diff --git a/storage/queued_country.hpp b/storage/queued_country.hpp
index a6c590e976..bccb18e080 100644
--- a/storage/queued_country.hpp
+++ b/storage/queued_country.hpp
@@ -50,8 +50,6 @@ public:
   std::string GetFileDownloadPath() const;
   uint64_t GetDownloadSize() const;
 
-  void ClarifyDownloadingType();
-
   void OnCountryInQueue() const;
   void OnStartDownloading() const;
   void OnDownloadProgress(downloader::Progress const & progress) const;
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 4a64856189..dd1a6d3052 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -812,7 +812,7 @@ void Storage::OnMapDownloadFinished(CountryId const & countryId, DownloadStatus
   {
     if (status == DownloadStatus::FileNotFound && type == MapFileType::Diff)
     {
-      m_diffsDataSource->AbortDiffScheme();
+      AbortDiffScheme();
       NotifyStatusChanged(GetRootId());
     }
 
@@ -1223,7 +1223,7 @@ void Storage::LoadDiffScheme()
 
   if (localMapsInfo.m_localMaps.empty())
   {
-    m_diffsDataSource->AbortDiffScheme();
+    AbortDiffScheme();
     return;
   }
 
@@ -1307,6 +1307,23 @@ void Storage::ApplyDiff(CountryId const & countryId, function<void(bool isSucces
       });
 }
 
+void Storage::AbortDiffScheme()
+{
+  std::vector<CountryId> countriesToReplace;
+  m_downloader->GetQueue().ForEachCountry([&countriesToReplace](QueuedCountry const & queuedCountry)
+                                          {
+                                            if (queuedCountry.GetFileType() == MapFileType::Diff)
+                                              countriesToReplace.push_back(queuedCountry.GetCountryId());
+                                          });
+
+  for (auto const & countryId : countriesToReplace)
+  {
+    DeleteCountryFilesFromDownloader(countryId);
+    DownloadCountry(countryId, MapFileType::Map);
+  }
+  m_diffsDataSource->AbortDiffScheme();
+}
+
 bool Storage::IsPossibleToAutoupdate() const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
diff --git a/storage/storage.hpp b/storage/storage.hpp
index e474c97b23..10e7313eb7 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -650,6 +650,7 @@ private:
 
   void LoadDiffScheme();
   void ApplyDiff(CountryId const & countryId, std::function<void(bool isSuccess)> const & fn);
+  void AbortDiffScheme();
 
   // Should be called once on startup, downloading process should be suspended until this method
   // was not called. Do not call this method manually.