diff --git a/src/intel/vulkan/anv_genX.h b/src/intel/vulkan/anv_genX.h
index bf640962a46..96346e8653b 100644
--- a/src/intel/vulkan/anv_genX.h
+++ b/src/intel/vulkan/anv_genX.h
@@ -558,17 +558,15 @@ uint32_t genX(shader_cmd_size)(struct anv_device *device,
 static inline void
 genX(cmd_buffer_post_dispatch_wa)(struct anv_cmd_buffer *cmd_buffer)
 {
-   /* TODO: Add INTEL_NEEDS_WA_14025112257 check once HSD is propogated for all
-    * other impacted platforms.
-    */
-   if (cmd_buffer->device->info->ver >= 20 &&
-       anv_cmd_buffer_is_compute_queue(cmd_buffer)) {
+#if INTEL_NEEDS_WA_14025112257
+   if (anv_cmd_buffer_is_compute_queue(cmd_buffer)) {
       genX(batch_emit_pipe_control)(&cmd_buffer->batch,
                                     cmd_buffer->device->info,
                                     cmd_buffer->state.current_pipeline,
                                     ANV_PIPE_STATE_CACHE_INVALIDATE_BIT,
                                     "Wa_14025112257");
    }
+#endif
 }
 
 static inline void
diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c
index 5a85fe505c2..142631bee6a 100644
--- a/src/intel/vulkan/genX_simple_shader.c
+++ b/src/intel/vulkan/genX_simple_shader.c
@@ -648,13 +648,13 @@ genX(emit_simple_shader_dispatch)(struct anv_simple_shader *state,
       if (state->cmd_buffer) {
          genX(cmd_buffer_post_dispatch_wa)(state->cmd_buffer);
       } else {
-         /* TODO: switch to use INTEL_NEEDS_WA_14025112257 */
-         if (device->info->ver >= 20 &&
-             batch->engine_class == INTEL_ENGINE_CLASS_COMPUTE) {
+#if INTEL_NEEDS_WA_14025112257
+         if (batch->engine_class == INTEL_ENGINE_CLASS_COMPUTE) {
             genX(batch_emit_pipe_control)(batch, devinfo, GPGPU,
                                           ANV_PIPE_STATE_CACHE_INVALIDATE_BIT,
                                           "Wa_14025112257");
          }
+#endif
       }
 
 #else /* GFX_VERx10 < 125 */