diff --git a/renderdoc/driver/d3d12/d3d12_device_wrap.cpp b/renderdoc/driver/d3d12/d3d12_device_wrap.cpp
index 482c66fc7..e476d28b4 100644
--- a/renderdoc/driver/d3d12/d3d12_device_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device_wrap.cpp
@@ -2406,6 +2406,20 @@ HRESULT WrappedID3D12Device::CheckFeatureSupport(D3D12_FEATURE Feature, void *pF
 
     return S_OK;
   }
+  else if(Feature == D3D12_FEATURE_D3D12_OPTIONS16)
+  {
+    D3D12_FEATURE_DATA_D3D12_OPTIONS16 *opts =
+        (D3D12_FEATURE_DATA_D3D12_OPTIONS16 *)pFeatureSupportData;
+    if(FeatureSupportDataSize != sizeof(D3D12_FEATURE_DATA_D3D12_OPTIONS16))
+      return E_INVALIDARG;
+
+    opts->GPUUploadHeapSupported = FALSE;
+
+    if(dolog)
+      RDCLOG("Forcing no GPU upload heap support");
+
+    return S_OK;
+  }
   else if(Feature == D3D12_FEATURE_D3D12_OPTIONS18)
   {
     D3D12_FEATURE_DATA_D3D12_OPTIONS18 *opts =