diff --git a/.pick_status.json b/.pick_status.json
index 9a1d0de480f..24d7d524380 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2461,7 +2461,7 @@
         "description": "etnaviv: query: reset sample count on begin_query",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_acc.c b/src/gallium/drivers/etnaviv/etnaviv_query_acc.c
index 193fa87cd34..5b570d8f087 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_query_acc.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_query_acc.c
@@ -86,6 +86,7 @@ etna_acc_begin_query(struct etna_context *ctx, struct etna_query *q)
 
    /* ->begin_query() discards previous results, so realloc bo */
    realloc_query_bo(ctx, aq);
+   aq->samples = 0;
 
    p->resume(aq, ctx);
    aq->samples++;
@@ -146,9 +147,6 @@ etna_acc_get_query_result(struct etna_context *ctx, struct etna_query *q,
    void *ptr = etna_bo_map(rsc->bo);
    bool success = p->result(aq, ptr, result);
 
-   if (success)
-      aq->samples = 0;
-
    etna_bo_cpu_fini(rsc->bo);
 
    return success;