diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index 8b80d983c..78a9af8fc 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -4424,6 +4424,9 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(
             const uint32_t execidx = argidx / comSig->sig.arguments.count();
 
             argOffset += comSig->sig.ByteStride * execidx;
+
+            if(argidx == maxCommands)
+              countToReplay = 0;
           }
 
           for(uint32_t i = 0; i < countToReplay; i++)