diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 7689b7f0e7..dcb3607434 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -129,6 +129,8 @@ namespace android
       m_work.BeginPaint(paintEvent);
       m_work.DoPaint(paintEvent);
 
+      NVEventSwapBuffersEGL();
+
       m_work.EndPaint(paintEvent);
     }
   }
diff --git a/android/jni/com/mapswithme/maps/Lifecycle.cpp b/android/jni/com/mapswithme/maps/Lifecycle.cpp
index 362afd94f8..bea83bbe3c 100644
--- a/android/jni/com/mapswithme/maps/Lifecycle.cpp
+++ b/android/jni/com/mapswithme/maps/Lifecycle.cpp
@@ -130,7 +130,7 @@ bool renderFrame(bool allocateIfNeeded)
 //    if (s_glesAutopaused)
 //        renderPauseScreen();
 
-    NVEventSwapBuffersEGL();
+//    NVEventSwapBuffersEGL();
 
     // A debug printout every 256 frames so we can see when we're
     // actively rendering and swapping