diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
index 7c0ce2d54..e38027ae9 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
@@ -1854,7 +1854,7 @@ void Debugger::CalcActiveMask(rdcarray<bool> &activeMask)
     // become uniform again.
     convergeBlock = workgroup[0].mergeBlock;
     for(size_t i = 1; i < workgroup.size(); i++)
-      RDCASSERT(convergeBlock == workgroup[i].mergeBlock);
+      RDCASSERT(!activeMask[i] || convergeBlock == workgroup[i].mergeBlock);
   }
 
   if(wasDiverged || diverged)