diff --git a/src/d3d11/d3d11_buffer.cpp b/src/d3d11/d3d11_buffer.cpp
index bb7e9809..8ce1efc5 100644
--- a/src/d3d11/d3d11_buffer.cpp
+++ b/src/d3d11/d3d11_buffer.cpp
@@ -34,10 +34,12 @@ namespace dxvk {
     }
     
     if (pDesc->BindFlags & D3D11_BIND_CONSTANT_BUFFER) {
-      info.usage  |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT
-                  |  VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
+      info.usage  |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
       info.stages |= m_device->GetEnabledShaderStages();
       info.access |= VK_ACCESS_UNIFORM_READ_BIT;
+
+      if (m_device->GetOptions()->constantBufferRangeCheck)
+        info.usage |= VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
     }
     
     if (pDesc->BindFlags & D3D11_BIND_SHADER_RESOURCE) {