diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 59620b5a2dd..3fec5b944d3 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -22,6 +22,7 @@
 #include "clb097.h"
 #include "clcb97.h"
 #include "nv_push_cl906f.h"
+#include "nv_push_cla16f.h"
 #include "nv_push_cl9097.h"
 #include "nv_push_cl90b5.h"
 #include "nv_push_cla097.h"
@@ -452,6 +453,10 @@ nvk_barrier_flushes_waits(VkPipelineStageFlags2 stages,
 
    enum nvk_barrier barriers = 0;
 
+   if (stages &
+       vk_expand_pipeline_stage_flags2(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT))
+      barriers |= NVK_BARRIER_WFI;
+
    if (access & VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT) {
       barriers |= NVK_BARRIER_FLUSH_SHADER_DATA;