diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index f7e1b7d1727..671a9a7ef8f 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -1818,7 +1818,7 @@ emit_gs_epilogue(struct radv_shader_context *ctx)
    }
 
    if (ctx->ac.chip_class >= GFX10)
-      LLVMBuildFence(ctx->ac.builder, LLVMAtomicOrderingRelease, false, "");
+      ac_build_waitcnt(&ctx->ac, AC_WAIT_VSTORE);
 
    ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_NOP | AC_SENDMSG_GS_DONE, ctx->gs_wave_id);
 }
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c b/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
index c862e2850ae..4ddc860aca7 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
@@ -217,7 +217,7 @@ static void emit_gs_epilogue(struct si_shader_context *ctx)
    }
 
    if (ctx->screen->info.chip_class >= GFX10)
-      LLVMBuildFence(ctx->ac.builder, LLVMAtomicOrderingRelease, false, "");
+      ac_build_waitcnt(&ctx->ac, AC_WAIT_VSTORE);
 
    if (ctx->screen->use_ngg) {
       /* Implement PIPE_STAT_QUERY_GS_PRIMITIVES for non-ngg draws because we can't