diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
index 961d4c2f5e..b6aa402cf2 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
@@ -439,9 +439,12 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
       return;
     }
 
-    updateViewPortRect();
-
     mPlacePage.post(this::setPeekHeight);
+
+    if (isHiddenState(mPlacePageBehavior.getState()))
+      return;
+
+    updateViewPortRect();
   }
 
   private void updateViewPortRect()
diff --git a/map/framework.cpp b/map/framework.cpp
index 2fc7d57876..e1d0a8a133 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1225,6 +1225,11 @@ void Framework::SetVisibleViewport(m2::RectD const & rect)
 {
   if (m_drapeEngine == nullptr)
     return;
+
+  double constexpr kEps = 0.5;
+  if (m2::IsEqual(m_visibleViewport, rect, kEps, kEps))
+    return;
+
   m_visibleViewport = rect;
   m_drapeEngine->SetVisibleViewport(rect);
 }