diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index a05615e2386..dffc509bece 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->StencilSampling == stencil)
             return GL_FALSE;
 
+         /* This should not be restored by glPopAttrib. */
+         FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT);
          texObj->StencilSampling = stencil;
          return GL_TRUE;
       }