diff --git a/generator/feature_processing_layers.cpp b/generator/feature_processing_layers.cpp
index b9e7a52ff4..b7e2181379 100644
--- a/generator/feature_processing_layers.cpp
+++ b/generator/feature_processing_layers.cpp
@@ -252,11 +252,9 @@ PromoCatalogLayer::PromoCatalogLayer(std::string const & citiesFinename)
 
 void PromoCatalogLayer::Handle(FeatureBuilder & feature)
 {
-  if (ftypes::IsCityTownOrVillage(feature.GetTypes()))
+  if (ftypes::IsCityTownOrVillage(feature.GetTypes()) &&
+      m_cities.find(feature.GetMostGenericOsmId()) != m_cities.cend())
   {
-    if (m_cities.find(feature.GetMostGenericOsmId()) == m_cities.cend())
-      return;
-
     auto static const kPromoType = classif().GetTypeByPath({"sponsored", "promo_catalog"});
     FeatureParams & params = feature.GetParams();
     params.AddType(kPromoType);