diff --git a/src/dxbc/dxbc_options.cpp b/src/dxbc/dxbc_options.cpp
index 94aceb59..1189689e 100644
--- a/src/dxbc/dxbc_options.cpp
+++ b/src/dxbc/dxbc_options.cpp
@@ -29,8 +29,10 @@ namespace dxvk {
       = adapter->matchesDriver(DxvkGpuVendor::Nvidia, VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR, 0, 0);
     
     strictDivision           = options.strictDivision;
-    constantBufferRangeCheck = options.constantBufferRangeCheck;
     zeroInitWorkgroupMemory  = options.zeroInitWorkgroupMemory;
+
+    if (DxvkGpuVendor(devInfo.core.properties.vendorID) != DxvkGpuVendor::Amd)
+      constantBufferRangeCheck = options.constantBufferRangeCheck;
     
     // Disable early discard on RADV due to GPU hangs
     // Disable early discard on Nvidia because it may hurt performance