diff --git a/.pick_status.json b/.pick_status.json
index a9e2317ea49..2b6510e178b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -8094,7 +8094,7 @@
         "description": "mesa: clear program info when updating program string",
         "nominated": false,
         "nomination_type": 0,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index 18de59b3ec6..4dec01c8282 100644
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -379,6 +379,14 @@ set_program_string(struct gl_program *prog, GLenum target, GLenum format, GLsize
       return;
    }
 
+   /* clear info */
+   shader_info new_info = { 0 };
+   new_info.name = prog->info.name;
+   new_info.label = prog->info.label;
+   new_info.stage = prog->info.stage;
+   new_info.use_legacy_math_rules = prog->info.use_legacy_math_rules;
+   prog->info = new_info;
+
 #ifdef ENABLE_SHADER_CACHE
    GLcharARB *replacement;