diff --git a/.pick_status.json b/.pick_status.json
index 0c0f19d32fd..42984f54a66 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2452,7 +2452,7 @@
         "description": "mesa: set a type for depth fallback texture",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0c6e56c391a262bef2d20037b4ca77d60948f3e7"
     },
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 1546551d8a4..e2b31d460f1 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1071,7 +1071,7 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex, bool is
       if (is_depth)
          texFormat = st_ChooseTextureFormat(ctx, target,
                                             GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT,
-                                            GL_NONE);
+                                            GL_UNSIGNED_INT);
       else
          texFormat = st_ChooseTextureFormat(ctx, target,
                                             GL_RGBA, GL_RGBA,