diff --git a/.pick_status.json b/.pick_status.json
index 1427d0f1492..0b66bc4fbb2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -10327,7 +10327,7 @@
         "description": "r600/sfn: Handle color0 writes all on R700 like on EG",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "069f3869ac3a140898224c8c37d5b3b6349361a4"
     },
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp
index 794c08d837b..09f2e6d876b 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp
@@ -491,10 +491,9 @@ bool FragmentShader::emit_export_pixel(nir_intrinsic_instr& intr)
       ShaderOutput output(driver_location, TGSI_SEMANTIC_COLOR, write_mask);
       add_output(output);
 
-      unsigned color_outputs = m_fs_write_all && chip_class() >= ISA_CC_EVERGREEN ?
+      unsigned color_outputs = m_fs_write_all && chip_class() >= ISA_CC_R700 ?
                                   m_max_color_exports : 1;
 
-
       for (unsigned k = 0; k < color_outputs; ++k) {
 
          unsigned location = (m_dual_source_blend && (semantics.location == FRAG_RESULT_COLOR)