diff --git a/src/Aardvark.Rendering.Vulkan/Swapchain/SwapchainDescription.fs b/src/Aardvark.Rendering.Vulkan/Swapchain/SwapchainDescription.fs
index c9cdd7761..5d2216ea7 100644
--- a/src/Aardvark.Rendering.Vulkan/Swapchain/SwapchainDescription.fs
+++ b/src/Aardvark.Rendering.Vulkan/Swapchain/SwapchainDescription.fs
@@ -135,7 +135,8 @@ type GraphicsMode(format : Col.Format, bits : int, depthBits : int, stencilBits
         modes |> Seq.maxBy presentModeScore
 
     override x.ChooseBufferCount(min, max) =
-        clamp min max buffers
+        if max = 0 then Fun.Max(min, buffers)
+        else clamp min max buffers
 
 type SwapchainDescription =
     {