diff --git a/.pick_status.json b/.pick_status.json
index eb6699d359b..a12b46010f1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1669,7 +1669,7 @@
         "description": "zink: wait on program cache fences before destroying programs",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 6e69c0cb461..a6c69797954 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -557,6 +557,7 @@ void
 zink_destroy_gfx_program(struct zink_screen *screen,
                          struct zink_gfx_program *prog)
 {
+   util_queue_fence_wait(&prog->base.cache_fence);
    if (prog->base.layout)
       VKSCR(DestroyPipelineLayout)(screen->dev, prog->base.layout, NULL);
 
@@ -601,6 +602,7 @@ void
 zink_destroy_compute_program(struct zink_screen *screen,
                          struct zink_compute_program *comp)
 {
+   util_queue_fence_wait(&comp->base.cache_fence);
    if (comp->base.layout)
       VKSCR(DestroyPipelineLayout)(screen->dev, comp->base.layout, NULL);