diff --git a/Source/Core/VideoBackends/Vulkan/SwapChain.cpp b/Source/Core/VideoBackends/Vulkan/SwapChain.cpp
index 1027099d21..d43a0e4499 100644
--- a/Source/Core/VideoBackends/Vulkan/SwapChain.cpp
+++ b/Source/Core/VideoBackends/Vulkan/SwapChain.cpp
@@ -290,8 +290,11 @@ bool SwapChain::CreateSwapChain()
     return false;
 
   // Select number of images in swap chain, we prefer one buffer in the background to work on
-  uint32_t image_count =
-      std::min(surface_capabilities.minImageCount + 1, surface_capabilities.maxImageCount);
+  uint32_t image_count = surface_capabilities.minImageCount + 1;
+
+  // maxImageCount can be zero, in which case there isn't an upper limit on the number of buffers.
+  if (surface_capabilities.maxImageCount > 0)
+    image_count = std::min(image_count, surface_capabilities.maxImageCount);
 
   // Determine the dimensions of the swap chain. Values of -1 indicate the size we specify here
   // determines window size?