diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp
index f4703e9..136eafd 100644
--- a/src/Vulkan/VkQueue.cpp
+++ b/src/Vulkan/VkQueue.cpp
@@ -235,9 +235,14 @@
 			presentInfo->pResults[i] = perSwapchainResult;
 		}
 
+		// Keep track of the worst result code. VK_SUBOPTIMAL_KHR is a success code so it should
+		// not override failure codes, but should not get replaced by a VK_SUCCESS result itself.
 		if(perSwapchainResult != VK_SUCCESS)
 		{
-			commandResult = perSwapchainResult;
+			if(commandResult == VK_SUCCESS || commandResult == VK_SUBOPTIMAL_KHR)
+			{
+				commandResult = perSwapchainResult;
+			}
 		}
 	}