diff --git a/android/src/app/organicmaps/Map.java b/android/src/app/organicmaps/Map.java
index df547cef44..921f3dc018 100644
--- a/android/src/app/organicmaps/Map.java
+++ b/android/src/app/organicmaps/Map.java
@@ -119,9 +119,6 @@ public final class Map
 
   public void onSurfaceCreated(final Context context, final Surface surface, Rect surfaceFrame, int surfaceDpi)
   {
-    if (nativeIsEngineCreated())
-      nativeDetachSurface(true);
-
     if (isThemeChangingProcess(context))
     {
       Logger.d(TAG, "Theme changing process, skip 'onSurfaceCreated' callback");
diff --git a/android/src/app/organicmaps/MapFragment.java b/android/src/app/organicmaps/MapFragment.java
index 326d8cfe59..657a729ead 100644
--- a/android/src/app/organicmaps/MapFragment.java
+++ b/android/src/app/organicmaps/MapFragment.java
@@ -115,8 +115,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
   @Override
   public void onPause()
   {
-    super.onPause();
     mMap.onPause(requireContext());
+    super.onPause();
   }
 
   @Override