diff --git a/.pick_status.json b/.pick_status.json
index dddbe5ffcdc..4e27d8dd860 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -544,7 +544,7 @@
         "description": "etnaviv: fix vertex sampler setup",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "81ab9fe2d0c2c2d9961107c88209f2fff1f136c4"
     },
diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture.c b/src/gallium/drivers/etnaviv/etnaviv_texture.c
index add31ff19c9..6164ff9959d 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_texture.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture.c
@@ -247,7 +247,7 @@ set_sampler_views(struct etna_context *ctx, unsigned start, unsigned end,
    uint32_t prev_active_sampler_views = ctx->active_sampler_views;
 
    for (i = start, j = 0; j < nr; i++, j++, mask <<= 1) {
-      struct pipe_sampler_view *view = views ? views[i] : NULL;
+      struct pipe_sampler_view *view = views ? views[j] : NULL;
 
       pipe_sampler_view_reference(&ctx->sampler_view[i], view);
       if (view) {