diff --git a/.pick_status.json b/.pick_status.json
index 002231b759a..d9c60f93fac 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "nv30: fix emulated vertex index buffers",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_vbo.c b/src/gallium/drivers/nouveau/nv30/nv30_vbo.c
index 78f442a7c0e..3e24e90c735 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_vbo.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_vbo.c
@@ -514,9 +514,9 @@ nv30_draw_elements(struct nv30_context *nv30, bool shorten,
       if (!info->has_user_indices)
          data = nouveau_resource_map_offset(&nv30->base,
                                             nv04_resource(info->index.resource),
-                                            start * index_size, NOUVEAU_BO_RD);
+                                            0, NOUVEAU_BO_RD);
       else
-         data = (char*)info->index.user + start * index_size;
+         data = info->index.user;
       if (!data)
          return;