diff --git a/storage/storage.cpp b/storage/storage.cpp
index 79f2b55fea..4a6e889ada 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -397,6 +397,10 @@ Storage::TLocalFilePtr Storage::GetLatestLocalFile(TCountryId const & countryId)
 
 Status Storage::CountryStatus(TCountryId const & countryId) const
 {
+  // Check if this country has failed while downloading.
+  if (m_failedCountries.count(countryId) > 0)
+    return Status::EDownloadFailed;
+
   // Check if we already downloading this country or have it in the queue
   if (IsCountryInQueue(countryId))
   {
@@ -406,10 +410,6 @@ Status Storage::CountryStatus(TCountryId const & countryId) const
       return Status::EInQueue;
   }
 
-  // Check if this country has failed while downloading.
-  if (m_failedCountries.count(countryId) > 0)
-    return Status::EDownloadFailed;
-
   return Status::EUnknown;
 }