diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index bbad639b320..17c9e671e53 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -75,12 +75,15 @@ genX(cmd_buffer_ensure_cfe_state)(struct anv_cmd_buffer *cmd_buffer,
       default:   unreachable("invalid stack_ids value");
       }
 
-#if INTEL_WA_14021821874_GFX_VER
-      /* Wa_14021821874: "StackIDControlOverride_RTGlobals = 0 (i.e. 2k)". We
+#if INTEL_WA_14021821874_GFX_VER || INTEL_WA_14018813551_GFX_VER
+      /* Wa_14021821874, Wa_14018813551:
+       *
+       * "StackIDControlOverride_RTGlobals = 0 (i.e. 2k)". We
        * already set stack size per ray to 64 in brw_nir_lower_rt_intrinsics
        * as the workaround also requires.
        */
-      if (intel_needs_workaround(cmd_buffer->device->info, 14021821874))
+      if (intel_needs_workaround(cmd_buffer->device->info, 14021821874) ||
+          intel_needs_workaround(cmd_buffer->device->info, 14018813551))
          cfe.StackIDControl = StackIDs2048;
 #endif