diff --git a/.pick_status.json b/.pick_status.json
index 8e1bd8791ab..28ed06b75cc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -436,7 +436,7 @@
         "description": "v3d: use primitive type to get stream output offset",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
index 64df2d8f9f0..9f573d799bd 100644
--- a/src/gallium/drivers/v3d/v3dx_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -1265,7 +1265,7 @@ v3d_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info,
          */
         for (int i = 0; i < v3d->streamout.num_targets; i++)
                 v3d_stream_output_target(v3d->streamout.targets[i])->offset +=
-                        draws[0].count;
+                        u_stream_outputs_for_vertices(info->mode, draws[0].count);
 
         if (v3d->zsa && job->zsbuf && v3d->zsa->base.depth_enabled) {
                 struct v3d_resource *rsc = v3d_resource(job->zsbuf->texture);