diff --git a/.pick_status.json b/.pick_status.json
index f0285b8ffe7..9d8ee416191 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6124,7 +6124,7 @@
         "description": "st/bitmap: only release YUV samplerviews",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "73da0dcddcb351f46544b207de55a4cb81654cb8",
         "notes": null
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index ed7f94b4f63..a05dc6369cf 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -255,8 +255,8 @@ setup_render_state(struct gl_context *ctx,
       pipe->set_sampler_views(pipe, MESA_SHADER_FRAGMENT, 0, num_views, 0,
                               sampler_views);
       st->state.num_sampler_views[MESA_SHADER_FRAGMENT] = num_views;
-
-      for (unsigned i = 0; i < num_views; i++)
+      /* only free YUV samplerviews */
+      u_foreach_bit(i, extra_sampler_views)
          pipe->sampler_view_release(pipe, sampler_views[i]);
    }