diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 0b36d5b97f..34bb638257 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -570,6 +570,7 @@ void Geocoder::GoImpl(vector<shared_ptr<MwmInfo>> & infos, bool inViewport)
 
   // Iterates through all alive mwms and performs geocoding.
   ForEachCountry(infos, processCountry);
+  m_preRanker.UpdateResults(true /* lastUpdate */);
 }
 
 void Geocoder::InitBaseContext(BaseContext & ctx)
diff --git a/search/pre_ranker.cpp b/search/pre_ranker.cpp
index 96a8e7f7fa..f7c778a00a 100644
--- a/search/pre_ranker.cpp
+++ b/search/pre_ranker.cpp
@@ -68,9 +68,6 @@ void PreRanker::Init(Params const & params)
 
 void PreRanker::Finish(bool cancelled)
 {
-  if (!cancelled)
-    UpdateResults(true /* lastUpdate */);
-
   m_ranker.Finish(cancelled);
 }
 
diff --git a/search/ranker.cpp b/search/ranker.cpp
index 06b4ee08e9..76f94ef99f 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -511,7 +511,7 @@ void Ranker::Init(Params const & params, Geocoder::Params const & geocoderParams
 
 void Ranker::Finish(bool cancelled)
 {
-  // The results have been updated by PreRanker.
+  // The results should be updated by Geocoder before Finish call.
   m_emitter.Finish(cancelled);
 }