diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index d9f5c77fa3..c1825d28e5 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -100,7 +100,10 @@ void RenderBucket::Render(ScreenBase const & screen)
     m_buffer->ApplyMutation(hasIndexMutation ? rfpIndex : nullptr, rfpAttrib);
   }
   m_buffer->Render();
+}
 
+void RenderBucket::RenderDebug(ScreenBase const & screen)
+{
 #ifdef RENDER_DEBUG_RECTS
   if (!m_overlay.empty())
   {
diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index d41ae7b283..4509e5acab 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -29,7 +29,10 @@ public:
   void CollectOverlayHandles(ref_ptr<OverlayTree> tree, bool isTransparent);
   void Render(ScreenBase const & screen);
 
-  /// Only for testing! Don't use this function in production code!
+  // Only for testing! Don't use this function in production code!
+  void RenderDebug(ScreenBase const & screen);
+
+  // Only for testing! Don't use this function in production code!
   template <typename ToDo>
   void ForEachOverlay(ToDo const & todo)
   {
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index 1712d71307..a268295ce4 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -1,6 +1,7 @@
 #include "drape_frontend/render_group.hpp"
 #include "drape_frontend/visual_params.hpp"
 
+#include "drape/debug_rect_renderer.hpp"
 #include "drape/shader_def.hpp"
 
 #include "geometry/screenbase.hpp"
@@ -83,6 +84,11 @@ void RenderGroup::Render(ScreenBase const & screen)
     dp::ApplyUniforms(m_uniforms, m_shader);
     for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
       renderBucket->Render(screen);
+
+#ifdef RENDER_DEBUG_RECTS
+    for(drape_ptr<dp::RenderBucket> & renderBucket : m_renderBuckets)
+      renderBucket->RenderDebug(screen);
+#endif
   }
   else
   {