diff --git a/.pick_status.json b/.pick_status.json
index 37108f61c24..aaf935074f6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2654,7 +2654,7 @@
         "description": "r300: fix vertex_buffer related refcnt imbalance",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8a963d122d4b67209214b0483084ba950814f42b",
         "notes": null
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index edad0071a5a..f77a6d6e97d 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -86,6 +86,9 @@ static void r300_destroy_context(struct pipe_context* context)
     if (r300->draw)
         draw_destroy(r300->draw);
 
+    for (unsigned i = 0; i < r300->nr_vertex_buffers; i++)
+       pipe_vertex_buffer_unreference(&r300->vertex_buffer[i]);
+
     if (r300->uploader)
         u_upload_destroy(r300->uploader);
     if (r300->context.stream_uploader)