diff --git a/storage/storage.cpp b/storage/storage.cpp
index 792f11b270..fde3caafdc 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -355,7 +355,11 @@ namespace storage
       if (i != string::npos)
         file = file.substr(i+1);
 
-      GetPlatform().RunAsync(bind(&Storage::GenerateSearchIndex, this, cref(file)));
+      // Generate search index if it's supported in this build
+      if (GetPlatform().IsFeatureSupported("search"))
+        GetPlatform().RunAsync(bind(&Storage::GenerateSearchIndex, this, cref(file)));
+      else // Or simply activate downloaded map
+        UpdateAfterSearchIndex(file);
     }
     m_request.reset();
     DownloadNextCountryFromQueue();