diff --git a/src/dxvk/dxvk_limits.h b/src/dxvk/dxvk_limits.h
index 7c77e2d03..17f5b36f6 100644
--- a/src/dxvk/dxvk_limits.h
+++ b/src/dxvk/dxvk_limits.h
@@ -5,17 +5,18 @@
 namespace dxvk {
   
   enum DxvkLimits : size_t {
-    MaxNumRenderTargets         =    8,
-    MaxNumVertexAttributes      =   32,
-    MaxNumVertexBindings        =   32,
-    MaxNumOutputStreams         =    4,
-    MaxNumViewports             =   16,
-    MaxNumResourceSlots         = 1208,
-    MaxNumActiveBindings        =  128,
-    MaxNumQueuedCommandBuffers  =    8,
-    MaxNumQueryCountPerPool     =  128,
-    MaxVertexBindingStride      = 2048,
-    MaxPushConstantSize         =  128,
+    MaxNumRenderTargets         =     8,
+    MaxNumVertexAttributes      =    32,
+    MaxNumVertexBindings        =    32,
+    MaxNumOutputStreams         =     4,
+    MaxNumViewports             =    16,
+    MaxNumResourceSlots         =  1208,
+    MaxNumActiveBindings        =   128,
+    MaxNumQueuedCommandBuffers  =     8,
+    MaxNumQueryCountPerPool     =   128,
+    MaxUniformBufferSize        = 65536,
+    MaxVertexBindingStride      =  2048,
+    MaxPushConstantSize         =   128,
   };
   
 }
\ No newline at end of file
diff --git a/src/dxvk/dxvk_unbound.cpp b/src/dxvk/dxvk_unbound.cpp
index de414d97e..befb837f0 100644
--- a/src/dxvk/dxvk_unbound.cpp
+++ b/src/dxvk/dxvk_unbound.cpp
@@ -64,7 +64,7 @@ namespace dxvk {
   
   Rc<DxvkBuffer> DxvkUnboundResources::createBuffer(DxvkDevice* dev) {
     DxvkBufferCreateInfo info;
-    info.size       = MaxVertexBindingStride;
+    info.size       = MaxUniformBufferSize;
     info.usage      = VK_BUFFER_USAGE_TRANSFER_DST_BIT
                     | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT
                     | VK_BUFFER_USAGE_INDEX_BUFFER_BIT