diff --git a/android/jni/com/mapswithme/vulkan/android_vulkan_context_factory.cpp b/android/jni/com/mapswithme/vulkan/android_vulkan_context_factory.cpp
index 7d361312ff..fb11714dfe 100644
--- a/android/jni/com/mapswithme/vulkan/android_vulkan_context_factory.cpp
+++ b/android/jni/com/mapswithme/vulkan/android_vulkan_context_factory.cpp
@@ -348,11 +348,13 @@ bool AndroidVulkanContextFactory::QuerySurfaceSize()
 
 void AndroidVulkanContextFactory::ResetSurface(bool allowPipelineDump)
 {
-  CHECK(m_nativeWindow != nullptr, ());
   ResetVulkanSurface(allowPipelineDump);
 
-  ANativeWindow_release(m_nativeWindow);
-  m_nativeWindow = nullptr;
+  if (m_nativeWindow != nullptr)
+  {
+    ANativeWindow_release(m_nativeWindow);
+    m_nativeWindow = nullptr;
+  }
 }
 
 void AndroidVulkanContextFactory::ResetVulkanSurface(bool allowPipelineDump)