diff --git a/.pick_status.json b/.pick_status.json
index 9bf384055e8..415e4cd3cab 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5454,7 +5454,7 @@
         "description": "cso: unbind vertex buffers when unbinding context",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index c57bc357ee5..d4546978adc 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -438,6 +438,7 @@ cso_unbind_context(struct cso_context *cso)
          ctx->base.pipe->bind_ms_state(ctx->base.pipe, NULL);
       }
       ctx->base.pipe->bind_vertex_elements_state(ctx->base.pipe, NULL);
+      ctx->base.pipe->set_vertex_buffers(ctx->base.pipe, 0, NULL);
 
       if (ctx->has_streamout)
          ctx->base.pipe->set_stream_output_targets(ctx->base.pipe, 0, NULL, NULL, 0);