diff --git a/drape/batcher.cpp b/drape/batcher.cpp
index 682ead9183..99b8803a44 100644
--- a/drape/batcher.cpp
+++ b/drape/batcher.cpp
@@ -171,6 +171,14 @@ void Batcher::EndSession()
   m_flushInterface = TFlushFn();
 }
 
+void Batcher::SetFeatureMinZoom(int minZoom)
+{
+  m_featureMinZoom = minZoom;
+
+  for (auto const & bucket : m_buckets)
+    bucket.second->SetFeatureMinZoom(m_featureMinZoom);
+}
+
 void Batcher::StartFeatureRecord(FeatureGeometryId feature, m2::RectD const & limitRect)
 {
   m_currentFeature = feature;
@@ -214,6 +222,7 @@ ref_ptr<RenderBucket> Batcher::GetBucket(GLState const & state)
   ref_ptr<RenderBucket> result = make_ref(buffer);
   if (m_currentFeature.IsValid())
     result->StartFeatureRecord(m_currentFeature, m_featureLimitRect);
+  result->SetFeatureMinZoom(m_featureMinZoom);
 
   m_buckets.emplace(BucketId(state, m_currentFeature.IsValid()), move(buffer));
 
diff --git a/drape/batcher.hpp b/drape/batcher.hpp
index 01f51b8f66..d8cc20d346 100644
--- a/drape/batcher.hpp
+++ b/drape/batcher.hpp
@@ -53,6 +53,7 @@ public:
   // Begin/end processing of feature with FeatureGeometryId in the batcher.
   void StartFeatureRecord(FeatureGeometryId feature, m2::RectD const & limitRect);
   void EndFeatureRecord();
+  void SetFeatureMinZoom(int minZoom);
 
 private:
   template<typename TBacher>
@@ -97,6 +98,7 @@ private:
 
   FeatureGeometryId m_currentFeature;
   m2::RectD m_featureLimitRect;
+  int m_featureMinZoom = 0;
 };
 
 class BatcherFactory
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index fefe6f8029..c18bcd997c 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -108,6 +108,12 @@ void RenderBucket::Render()
   m_buffer->Render();
 }
 
+void RenderBucket::SetFeatureMinZoom(int minZoom)
+{
+  if (minZoom < m_featuresMinZoom)
+    m_featuresMinZoom = minZoom;
+}
+
 void RenderBucket::StartFeatureRecord(FeatureGeometryId feature, const m2::RectD & limitRect)
 {
   m_featureInfo = make_pair(feature, FeatureGeometryInfo(limitRect));
diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index c2837a96d1..809a9b7fba 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -4,6 +4,7 @@
 #include "drape/pointers.hpp"
 
 #include "std/function.hpp"
+#include "std/limits.hpp"
 
 class ScreenBase;
 
@@ -54,6 +55,9 @@ public:
   void StartFeatureRecord(FeatureGeometryId feature, m2::RectD const & limitRect);
   void EndFeatureRecord(bool featureCompleted);
 
+  void SetFeatureMinZoom(int minZoom);
+  int GetMinZoom() const { return m_featuresMinZoom; }
+
   using TCheckFeaturesWaiting = function<bool(m2::RectD const &)>;
   bool IsFeaturesWaiting(TCheckFeaturesWaiting isFeaturesWaiting);
 
@@ -73,6 +77,7 @@ private:
   using TFeaturesGeometryInfo = map<FeatureGeometryId, FeatureGeometryInfo>;
   using TFeatureInfo = pair<FeatureGeometryId, FeatureGeometryInfo>;
 
+  int m_featuresMinZoom = numeric_limits<int>::max();
   TFeatureInfo m_featureInfo;
   TFeaturesGeometryInfo m_featuresGeometryInfo;
 
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 416eca17f5..09b2225273 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -193,6 +193,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
         ref_ptr<dp::Batcher> batcher = m_batchersPool->GetTileBatcher(tileKey);
         for (drape_ptr<MapShape> const & shape : msg->GetShapes())
         {
+          batcher->SetFeatureMinZoom(shape->GetFeatureMinZoom());
           bool const sharedFeature = shape->GetFeatureInfo().IsValid();
           if (sharedFeature)
             batcher->StartFeatureRecord(shape->GetFeatureInfo(), shape->GetFeatureLimitRect());
diff --git a/drape_frontend/batch_merge_helper.cpp b/drape_frontend/batch_merge_helper.cpp
index b3ec78386e..16f3482c2f 100644
--- a/drape_frontend/batch_merge_helper.cpp
+++ b/drape_frontend/batch_merge_helper.cpp
@@ -149,6 +149,7 @@ void BatchMergeHelper::MergeBatches(vector<drape_ptr<RenderGroup>> & batches,
 
       if (b->IsShared())
         bucket->AddFeaturesInfo(*b);
+      bucket->SetFeatureMinZoom(b->GetMinZoom());
 
       uint32_t indexOffset = newBuffer->GetStartIndexValue();
 
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 49b844da90..cd43bb31bd 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -854,7 +854,7 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView)
   for (RenderLayer & layer : m_layers)
   {
     for (auto & group : layer.m_renderGroups)
-      layer.m_isDirty |= group->UpdateFeaturesWaitingStatus(isFeaturesWaiting, make_ref(m_overlayTree));
+      layer.m_isDirty |= group->UpdateFeaturesWaitingStatus(isFeaturesWaiting, m_currentZoomLevel, make_ref(m_overlayTree));
   }
 
   bool const isPerspective = modelView.isPerspective();
diff --git a/drape_frontend/map_shape.hpp b/drape_frontend/map_shape.hpp
index 2f138b939b..6d48794cd3 100644
--- a/drape_frontend/map_shape.hpp
+++ b/drape_frontend/map_shape.hpp
@@ -37,9 +37,13 @@ public:
   void SetFeatureLimitRect(m2::RectD rect) { m_limitRect = rect; }
   m2::RectD const & GetFeatureLimitRect() const { return m_limitRect; }
 
+  void SetFeatureMinZoom(int minZoom) { m_minZoom = minZoom; }
+  int GetFeatureMinZoom() const { return m_minZoom; }
+
 private:
   dp::FeatureGeometryId m_featureInfo;
   m2::RectD m_limitRect;
+  int m_minZoom = 0;
 };
 
 using TMapShapes = vector<drape_ptr<MapShape>>;
diff --git a/drape_frontend/overlay_batcher.cpp b/drape_frontend/overlay_batcher.cpp
index 09ce323bd1..2d9676a193 100644
--- a/drape_frontend/overlay_batcher.cpp
+++ b/drape_frontend/overlay_batcher.cpp
@@ -26,6 +26,7 @@ OverlayBatcher::OverlayBatcher(TileKey const & key)
 
 void OverlayBatcher::Batch(drape_ptr<MapShape> const & shape, ref_ptr<dp::TextureManager> texMng)
 {
+  m_batcher.SetFeatureMinZoom(shape->GetFeatureMinZoom());
   bool const sharedFeature = shape->GetFeatureInfo().IsValid();
   if (sharedFeature)
     m_batcher.StartFeatureRecord(shape->GetFeatureInfo(), shape->GetFeatureLimitRect());
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index b325bbb1a8..8b8765d239 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -187,7 +187,7 @@ void RenderGroup::Disappear()
   //}
 }
 
-bool RenderGroup::UpdateFeaturesWaitingStatus(TCheckFeaturesWaiting isFeaturesWaiting, ref_ptr<dp::OverlayTree> tree)
+bool RenderGroup::UpdateFeaturesWaitingStatus(TCheckFeaturesWaiting isFeaturesWaiting, int currentZoom, ref_ptr<dp::OverlayTree> tree)
 {
   if (!m_sharedFeaturesWaiting)
     return false;
@@ -197,8 +197,9 @@ bool RenderGroup::UpdateFeaturesWaitingStatus(TCheckFeaturesWaiting isFeaturesWa
 
   for (size_t i = 0; i < m_renderBuckets.size(); )
   {
-    bool visibleBucket = m_renderBuckets[i]->IsShared() ? m_renderBuckets[i]->IsFeaturesWaiting(isFeaturesWaiting)
-                                                        : isTileVisible;
+    bool visibleBucket = (m_renderBuckets[i]->GetMinZoom() <= currentZoom) &&
+        (m_renderBuckets[i]->IsShared() ? m_renderBuckets[i]->IsFeaturesWaiting(isFeaturesWaiting)
+                                        : isTileVisible);
     if (!visibleBucket)
     {
       m_renderBuckets[i]->RemoveOverlayHandles(tree);
diff --git a/drape_frontend/render_group.hpp b/drape_frontend/render_group.hpp
index 4941defe54..21eff40c38 100755
--- a/drape_frontend/render_group.hpp
+++ b/drape_frontend/render_group.hpp
@@ -79,7 +79,7 @@ public:
   }
 
   using TCheckFeaturesWaiting = function<bool(m2::RectD const &)>;
-  bool UpdateFeaturesWaitingStatus(TCheckFeaturesWaiting isFeaturesWaiting, ref_ptr<dp::OverlayTree> tree);
+  bool UpdateFeaturesWaitingStatus(TCheckFeaturesWaiting isFeaturesWaiting, int currentZoom, ref_ptr<dp::OverlayTree> tree);
 
   bool IsLess(RenderGroup const & other) const;
 
diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp
index 1f207fbd4a..b4c6938a45 100644
--- a/drape_frontend/rule_drawer.cpp
+++ b/drape_frontend/rule_drawer.cpp
@@ -139,11 +139,12 @@ void RuleDrawer::operator()(FeatureType const & f)
   int const minVisibleScale = feature::GetMinDrawableScale(f);
 
   uint32_t shapesCount = 0;
-  auto insertShape = [this, zoomLevel, &tileRect, &limitRect, &shapesCount, &f](drape_ptr<MapShape> && shape)
+  auto insertShape = [this, zoomLevel, minVisibleScale, &tileRect, &limitRect, &shapesCount, &f](drape_ptr<MapShape> && shape)
   {
     int const index = static_cast<int>(shape->GetType());
     ASSERT_LESS(index, m_mapShapes.size(), ());
 
+    shape->SetFeatureMinZoom(minVisibleScale);
     if (!tileRect.IsRectInside(limitRect))
     {
       shape->SetFeatureInfo(dp::FeatureGeometryId(f.GetID(), shapesCount));