diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index c58d18528b..6c37d6d4ba 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -676,9 +676,11 @@ void Geocoder::FillLocalitiesTable(BaseContext const & ctx)
         if (m_citiesBoundaries.Get(ft.GetID(), boundaries))
         {
           city.m_rect = boundaries.GetLimitRect();
-          haveBoundary = true;
+          if (city.m_rect.IsValid())
+            haveBoundary = true;
         }
-        else
+
+        if (!haveBoundary)
         {
           auto const center = feature::GetCenter(ft);
           auto const population = ftypes::GetPopulation(ft);