diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs
index 1ded64b1493..b60d1adcb8d 100644
--- a/src/gallium/frontends/rusticl/core/kernel.rs
+++ b/src/gallium/frontends/rusticl/core/kernel.rs
@@ -1291,7 +1291,8 @@ impl Kernel {
                 && grid[0] <= hw_max_grid[0]
                 && grid[1] <= hw_max_grid[1]
                 && grid[2] <= hw_max_grid[2]
-                && block == kernel_info.work_group_size_hint
+                && (kernel_info.work_group_size_hint == [0; 3]
+                    || block == kernel_info.work_group_size_hint)
             {
                 NirKernelVariant::Optimized
             } else {