diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index 78a7cc0bc..539d7ad59 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -1104,7 +1104,7 @@ void D3D12Replay::FillRootElements(const D3D12RenderState::RootSignature &rootSi
           desc += e->offset;
           desc += offset;
 
-          if(num == UINT_MAX)
+          if(num >= heap->GetNumDescriptors())
           {
             UINT availDescriptors = heap->GetNumDescriptors() - offset - UINT(e->offset);