diff --git a/.pick_status.json b/.pick_status.json
index dbd6960f61b..cb23023aff1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2902,7 +2902,7 @@
         "description": "radeonsi: fix uses_instanceid for merged mono shader stage",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "894d92995cdcecfabf061cbacf65c194ea84338b"
     },
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c
index 68b3fd09edb..a196b27421e 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c
@@ -1139,7 +1139,8 @@ bool si_llvm_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler *
             si_llvm_dispose(&ctx);
             return false;
          }
-         shader->info.uses_instanceid |= ls->info.uses_instanceid;
+         shader->info.uses_instanceid |=
+            ls->info.uses_instanceid || shader_ls.info.uses_instanceid;
          parts[0] = ctx.main_fn;
 
          for (int i = 0; i < ctx.args->ac.arg_count; i++)
@@ -1184,7 +1185,8 @@ bool si_llvm_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler *
             si_llvm_dispose(&ctx);
             return false;
          }
-         shader->info.uses_instanceid |= es->info.uses_instanceid;
+         shader->info.uses_instanceid |=
+            es->info.uses_instanceid || shader_es.info.uses_instanceid;
          es_main = ctx.main_fn;
 
          /* Preserve main (= es_main) arguments. */