diff --git a/renderdoc/driver/d3d12/d3d12_state.cpp b/renderdoc/driver/d3d12/d3d12_state.cpp
index e455e527a7..6bf1884c1d 100644
--- a/renderdoc/driver/d3d12/d3d12_state.cpp
+++ b/renderdoc/driver/d3d12/d3d12_state.cpp
@@ -245,7 +245,8 @@ void D3D12RenderState::ApplyState(WrappedID3D12Device *dev, ID3D12GraphicsComman
       }
 
       // safe to set this - if the pipeline has view instancing disabled, it will do nothing
-      if(dev->GetOpts3().ViewInstancingTier != D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED)
+      if(dev->GetOpts3().ViewInstancingTier != D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED &&
+         viewInstMask != 0)
         cmd->SetViewInstanceMask(viewInstMask);
     }