diff --git a/.pick_status.json b/.pick_status.json
index bda24790307..7bd79ccc86d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -247,7 +247,7 @@
         "description": "tnl: Reset nr_bos to 0 between map/unmap cycles.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e99e7aa4c1ddd7b8c2c4388f4f8e4fa1955ca771"
     },
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index bffab548a0f..1370af691c2 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -494,7 +494,7 @@ void _tnl_draw_prims(struct gl_context *ctx,
        * one for the index buffer.
        */
       struct gl_buffer_object *bo[VERT_ATTRIB_MAX + 1];
-      GLuint nr_bo = 0;
+      GLuint nr_bo;
       GLuint inst;
 
       assert(num_instances > 0);
@@ -517,6 +517,7 @@ void _tnl_draw_prims(struct gl_context *ctx,
           * They will need to be unmapped below.
           */
          for (inst = 0; inst < num_instances; inst++) {
+            nr_bo = 0;
 
             bind_prims(ctx, &prim[i], this_nr_prims);
             bind_inputs(ctx, arrays, max_index + prim[i].basevertex + 1,