diff --git a/.pick_status.json b/.pick_status.json
index 4b960b76cc7..cdff81b2ec9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1684,7 +1684,7 @@
         "description": "mesa: extend linear_as_nearest work around",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 6b813a07c99..754fdd3b33e 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -152,7 +152,8 @@ _mesa_is_texture_complete(const struct gl_texture_object *texObj,
        * but some applications (eg: Grid Autosport) uses the default
        * filtering values.
        */
-      if (texObj->_IsIntegerFormat &&
+      if ((texObj->_IsIntegerFormat ||
+           (texObj->StencilSampling && img->_BaseFormat == GL_DEPTH_STENCIL)) &&
           linear_as_nearest_for_int_tex) {
          /* Skip return */
       } else {