diff --git a/map/framework.cpp b/map/framework.cpp
index 7367e2eef8..5fce23ac9a 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -728,8 +728,10 @@ void Framework::DrawModel(shared_ptr<PaintEvent> const & e,
   screen.PtoG(m2::Inflate(m2::RectD(renderRect), inflationSize, inflationSize), clipRect);
   screen.PtoG(m2::RectD(renderRect), selectRect);
 
-  int const drawScale = m_queryMaxScaleMode ? scales::GetUpperScale() : m_scales.GetDrawTileScale(baseScale);
+  int drawScale = m_scales.GetDrawTileScale(baseScale);
   fwork::FeatureProcessor doDraw(clipRect, screen, e, drawScale);
+  if (m_queryMaxScaleMode)
+    drawScale = scales::GetUpperScale();
 
   try
   {