diff --git a/.pick_status.json b/.pick_status.json
index 7a0b46d5045..9632ec2b166 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5530,7 +5530,7 @@
         "description": "mesa: fix glPopClientAttrib with fixed-func VP and zero-stride varyings",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3a294ff01fb9d1d8b4f984a364ed7ef469624c49"
     },
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index f2eaddf09a4..af8816f1f05 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1313,6 +1313,8 @@ restore_array_attrib(struct gl_context *ctx,
    }
 
    _mesa_update_edgeflag_state_vao(ctx);
+   _mesa_set_varying_vp_inputs(ctx, ctx->VertexProgram._VPModeInputFilter &
+                               ctx->Array.VAO->_EnabledWithMapMode);
 }