diff --git a/.pick_status.json b/.pick_status.json
index 83b376b9bfd..64d1346a1f8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2713,7 +2713,7 @@
         "description": "zink: don't free non-fbfetch dsl structs when switching to fbfetch",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index eb93583954c..91274442a77 100644
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -1787,8 +1787,9 @@ zink_descriptor_util_init_fbfetch(struct zink_context *ctx)
 
    struct zink_screen *screen = zink_screen(ctx->base.screen);
    VKSCR(DestroyDescriptorSetLayout)(screen->dev, ctx->dd->push_dsl[0]->layout, NULL);
-   ralloc_free(ctx->dd->push_dsl[0]);
-   ralloc_free(ctx->dd->push_layout_keys[0]);
+   //don't free these now, let ralloc free on teardown to avoid invalid access
+   //ralloc_free(ctx->dd->push_dsl[0]);
+   //ralloc_free(ctx->dd->push_layout_keys[0]);
    ctx->dd->push_dsl[0] = create_gfx_layout(ctx, &ctx->dd->push_layout_keys[0], true);
    ctx->dd->has_fbfetch = true;
    if (screen->descriptor_mode != ZINK_DESCRIPTOR_MODE_LAZY)