diff --git a/.pick_status.json b/.pick_status.json
index 9b2e02ea4cb..3766a3ba3e8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -589,7 +589,7 @@
         "description": "etnaviv: free tgsi tokens when shader state is deleted",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index b44354483ae..1aff32baec9 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -445,6 +445,7 @@ etna_delete_shader_state(struct pipe_context *pctx, void *ss)
          etna_destroy_shader(t);
    }
 
+   tgsi_free_tokens(shader->tokens);
    ralloc_free(shader->nir);
    FREE(shader);
 }