diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp
index 0302354f80..69d28a3394 100644
--- a/indexer/feature_utils.cpp
+++ b/indexer/feature_utils.cpp
@@ -80,6 +80,10 @@ public:
     {
       // get minimal draw text scale for feature type, that not mentioned in GetScaleForType
       scale = feature::DrawableScaleRangeForText(types).first;
+
+      // if no texts at all - show at maximum zoom
+      if (scale == -1)
+        scale = upperScale;
     }
 
     return scales::GetRectForLevel(scale, center, 1.0);
diff --git a/indexer/feature_visibility.hpp b/indexer/feature_visibility.hpp
index 70b8790b37..bd9b30984c 100644
--- a/indexer/feature_visibility.hpp
+++ b/indexer/feature_visibility.hpp
@@ -28,8 +28,12 @@ namespace feature
 
   int MinDrawableScaleForFeature(FeatureBase const & f);
 
+  /// @name Get scale range when feature's text is visible.
+  /// @return [-1, -1] if no any text exists
+  //@{
   pair<int, int> DrawableScaleRangeForText(TypesHolder const & types);
   pair<int, int> DrawableScaleRangeForText(FeatureBase const & f);
+  //@}
 
   /// @return (geometry type, is coastline)
   pair<int, bool> GetDrawRule(FeatureBase const & f, int level,