diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index cd2675e24f..335bd5cea7 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -1006,7 +1006,7 @@ double FeatureType::GetPopulationDrawRank() const
 
   // Do not return rank for countries.
   if (feature::IsCountry(m_Types, m_Types + GetTypesCount()))
-    return 0.5;
+    return 0.0;
   else
     return min(3.0E6, static_cast<double>(n)) / 3.0E6;
 }
diff --git a/map/framework.cpp b/map/framework.cpp
index 723b512ba6..ca2c126863 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -163,7 +163,7 @@ namespace fwork
 
     shared_ptr<di::DrawInfo> ptr(
           new di::DrawInfo(f.GetPreferredDrawableName(languages::GetCurrentPriorities()),
-                            f.GetPopulationDrawRank()));
+                           m_zoom > 5 ? f.GetPopulationDrawRank() : 0.0));
 
     DrawerYG * pDrawer = GetDrawer();