diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index 11116e87f..98deb0bb9 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -6658,12 +6658,12 @@ ShaderDebugTrace *VulkanReplay::DebugComputeCommon(ShaderStage stage, uint32_t e
     RDCASSERTNOTEQUAL(subgroupSize, 0);
     numThreads = RDCMAX(numThreads, subgroupSize);
 
-    if(hasQuadScope)
-      RDCASSERT(numThreads >= 4);
-
     if(hasWorkgroupScope)
       numThreads = RDCMAX(numThreads, threadDim[0] * threadDim[1] * threadDim[2]);
 
+    if(hasQuadScope)
+      RDCASSERT(numThreads >= 4);
+
     apiWrapper->global_builtins[ShaderBuiltin::NumSubgroups] =
         ShaderVariable(rdcstr(), winner->numSubgroups, 0U, 0U, 0U);