diff --git a/.pick_status.json b/.pick_status.json
index 5a70009a789..157cb54b839 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -283,7 +283,7 @@
         "description": "mesa: flush glBegin/End before changing GL_DEPTH_STENCIL_TEXTURE_MODE",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "23e81b93bbe3966a842de507988eeaa7342e12ca"
     },
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index d99ed4f1408..813d85b2ec0 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -506,6 +506,8 @@ set_tex_parameteri(struct gl_context *ctx,
          if (texObj->Attrib.StencilSampling == stencil)
             return GL_FALSE;
 
+         /* This should not be restored by glPopAttrib. */
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT);
          texObj->Attrib.StencilSampling = stencil;
          return GL_TRUE;
       }