diff --git a/include/mbgl/vulkan/context.hpp b/include/mbgl/vulkan/context.hpp
index 9b5183d8f54..08e439df3f6 100644
--- a/include/mbgl/vulkan/context.hpp
+++ b/include/mbgl/vulkan/context.hpp
@@ -146,7 +146,7 @@ class Context final : public gfx::Context {
     void enqueueDeletion(std::function<void(Context&)>&& function);
     void submitOneTimeCommand(const std::function<void(const vk::UniqueCommandBuffer&)>& function) const;
 
-    void requestSurfaceUpdate();
+    void requestSurfaceUpdate(bool useDelay = true);
 
 private:
     struct FrameResources {
diff --git a/src/mbgl/vulkan/context.cpp b/src/mbgl/vulkan/context.cpp
index a6135b9b269..9f54ebed28b 100644
--- a/src/mbgl/vulkan/context.cpp
+++ b/src/mbgl/vulkan/context.cpp
@@ -171,13 +171,17 @@ void Context::submitOneTimeCommand(const std::function<void(const vk::UniqueComm
     }
 }
 
-void Context::requestSurfaceUpdate() {
+void Context::requestSurfaceUpdate(bool useDelay) {
     if (surfaceUpdateRequested) {
+        if (!useDelay) {
+            surfaceUpdateLatency = 0;
+        }
+
         return;
     }
 
     surfaceUpdateRequested = true;
-    surfaceUpdateLatency = backend.getMaxFrames() * 3;
+    surfaceUpdateLatency = useDelay ? backend.getMaxFrames() * 3 : 0;
 }
 
 void Context::waitFrame() const {
@@ -212,7 +216,7 @@ void Context::beginFrame() {
         }
     }
 
-    if (platformSurface && surfaceUpdateRequested && --surfaceUpdateLatency == 0) {
+    if (platformSurface && surfaceUpdateRequested && --surfaceUpdateLatency <= 0) {
         renderableResource.recreateSwapchain();
 
         // we wait for an idle device to recreate the swapchain
@@ -252,14 +256,13 @@ void Context::beginFrame() {
             if (acquireImageResult.result == vk::Result::eSuccess) {
                 renderableResource.setAcquiredImageIndex(acquireImageResult.value);
             } else if (acquireImageResult.result == vk::Result::eSuboptimalKHR) {
+                renderableResource.setAcquiredImageIndex(acquireImageResult.value);
                 requestSurfaceUpdate();
-                beginFrame();
-                return;
             }
 
         } catch (const vk::OutOfDateKHRError& e) {
             // request an update and restart frame
-            requestSurfaceUpdate();
+            requestSurfaceUpdate(false);
             beginFrame();
             return;
         }
@@ -319,7 +322,7 @@ void Context::submitFrame() {
                 requestSurfaceUpdate();
             }
         } catch (const vk::OutOfDateKHRError& e) {
-            requestSurfaceUpdate();
+            requestSurfaceUpdate(false);
         }
     }