diff --git a/renderdoc/driver/vulkan/vk_outputwindow.cpp b/renderdoc/driver/vulkan/vk_outputwindow.cpp
index 7ccf73519..7c596b206 100644
--- a/renderdoc/driver/vulkan/vk_outputwindow.cpp
+++ b/renderdoc/driver/vulkan/vk_outputwindow.cpp
@@ -864,6 +864,9 @@ void VulkanReplay::BindOutputWindow(uint64_t id, bool depth)
                                     &outw.curidx);
     }
 
+    if(vkr == VK_SUBOPTIMAL_KHR)
+      vkr = VK_SUCCESS;
+
     RDCASSERTEQUAL(vkr, VK_SUCCESS);
 
     VkSubmitInfo submitInfo = {