diff --git a/.pick_status.json b/.pick_status.json
index 5b9d61943a8..52e5113037e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -494,7 +494,7 @@
         "description": "nir: fix gathering color interp modes in nir_lower_color_inputs",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "709ebd8293a678db614c5b48dac2fc1da0b2306d",
         "notes": null
diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 950b1216c3d..71063467ce0 100644
--- a/src/compiler/nir/nir_lower_io.c
+++ b/src/compiler/nir/nir_lower_io.c
@@ -3146,6 +3146,14 @@ nir_lower_color_inputs(nir_shader *nir)
    nir_function_impl *impl = nir_shader_get_entrypoint(nir);
    bool progress = false;
 
+   /* Both flat and non-flat can occur with nir_io_mix_convergent_flat_with_interpolated,
+    * but we want to save only the non-flat interp mode in that case.
+    *
+    * Start with flat and set to non-flat only if it's present.
+    */
+   nir->info.fs.color0_interp = INTERP_MODE_FLAT;
+   nir->info.fs.color1_interp = INTERP_MODE_FLAT;
+
    nir_builder b = nir_builder_create(impl);
 
    nir_foreach_block(block, impl) {
@@ -3189,13 +3197,15 @@ nir_lower_color_inputs(nir_shader *nir)
 
          if (sem.location == VARYING_SLOT_COL0) {
             load = nir_load_color0(&b);
-            nir->info.fs.color0_interp = interp;
+            if (interp != INTERP_MODE_FLAT)
+               nir->info.fs.color0_interp = interp;
             nir->info.fs.color0_sample = sample;
             nir->info.fs.color0_centroid = centroid;
          } else {
             assert(sem.location == VARYING_SLOT_COL1);
             load = nir_load_color1(&b);
-            nir->info.fs.color1_interp = interp;
+            if (interp != INTERP_MODE_FLAT)
+               nir->info.fs.color1_interp = interp;
             nir->info.fs.color1_sample = sample;
             nir->info.fs.color1_centroid = centroid;
          }