diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 47dccb11a83..553244dfbc0 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -11571,6 +11571,7 @@ select_shader(isel_context& ctx, nir_shader* nir, const bool need_startpgm, cons
        (ctx.stage.sw == SWStage::TES && ctx.stage.hw == AC_HW_LEGACY_GEOMETRY_SHADER)) {
       assert(program->gfx_level >= GFX9);
       create_merged_jump_to_epilog(&ctx);
+      ctx.block->kind |= block_kind_export_end;
    }
 
    cleanup_context(&ctx);