diff --git a/.pick_status.json b/.pick_status.json
index 5b35ac1d24d..34ecce0ab42 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1327,7 +1327,7 @@
         "description": "st/mesa: fix use-after-free when updating shader info in st_link_nir",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "549ae5f84375dfadb86cfd465f0103acfae3249f"
     },
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 8c835e54bfe..d483d526cc9 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -834,6 +834,8 @@ st_link_nir(struct gl_context *ctx,
        */
       shader_info old_info = prog->info;
       prog->info = prog->nir->info;
+      prog->info.name = old_info.name;
+      prog->info.label = old_info.label;
       prog->info.num_ssbos = old_info.num_ssbos;
       prog->info.num_ubos = old_info.num_ubos;
       prog->info.num_abos = old_info.num_abos;