diff --git a/.pick_status.json b/.pick_status.json
index 92def1f576a..c6dfbd48a15 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3883,7 +3883,7 @@
         "description": "radv: fix emitting invalid color attachments",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "97dc28b177649e40a4f2a15af65ebb69ee06b6fe"
     },
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 96924b31991..cc754e80704 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2825,8 +2825,8 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer)
    int i;
    bool disable_constant_encode_ac01 = false;
    unsigned color_invalid = cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11
-                            ? G_028C70_FORMAT_GFX11(V_028C70_COLOR_INVALID)
-                            : G_028C70_FORMAT_GFX6(V_028C70_COLOR_INVALID);
+                            ? S_028C70_FORMAT_GFX11(V_028C70_COLOR_INVALID)
+                            : S_028C70_FORMAT_GFX6(V_028C70_COLOR_INVALID);
 
    for (i = 0; i < render->color_att_count; ++i) {
       struct radv_image_view *iview = render->color_att[i].iview;