diff --git a/.pick_status.json b/.pick_status.json
index 063c75cabd8..dfad2770241 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4693,7 +4693,7 @@
         "description": "aco: set has_color_exports with GPL",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "192486b7aa5ef3b24516e16b0e219fad7032fb7c"
     },
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 7ab54194197..75776be6225 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -11497,6 +11497,9 @@ create_fs_exports(isel_context* ctx)
 
    if (ctx->program->info.ps.has_epilog) {
       create_fs_jump_to_epilog(ctx);
+
+      /* FS epilogs always have at least one color/null export. */
+      ctx->program->has_color_exports = true;
    } else {
       struct aco_export_mrt mrts[8];
       unsigned compacted_mrt_index = 0;