diff --git a/platform/http_request.cpp b/platform/http_request.cpp
index 355681d424..e9c857838a 100644
--- a/platform/http_request.cpp
+++ b/platform/http_request.cpp
@@ -271,8 +271,6 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
       // Rename finished file to it's original name.
       Platform::RemoveFileIfExists(m_filePath);
       base::RenameFileX(m_filePath + DOWNLOADING_FILE_EXTENSION, m_filePath);
-
-      Platform::DisableBackupForFile(m_filePath);
     }
 
     // 4. Finish downloading.
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 6e5f23c8a4..ed2e835b6d 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -679,6 +679,11 @@ void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapFileType t
 
     LocalFilePtr localFile = GetLocalFile(countryId, GetCurrentDataVersion());
     ASSERT(localFile, ());
+
+    // This is the final point of success download or diff or update, so better
+    // to call DisableBackupForFile here and don't depend from different downloaders.
+    Platform::DisableBackupForFile(localFile->GetPath(MapFileType::Map));
+
     DeleteCountryIndexes(*localFile);
     m_didDownload(countryId, localFile);
 
@@ -1322,7 +1327,6 @@ void Storage::ApplyDiff(CountryId const & countryId, function<void(bool isSucces
         case DiffApplicationResult::Ok:
         {
           RegisterCountryFiles(diffFile);
-          Platform::DisableBackupForFile(diffFile->GetPath(MapFileType::Map));
           m_diffsDataSource->MarkAsApplied(countryId);
           fn(true);
           break;