diff --git a/.pick_status.json b/.pick_status.json
index 3d178a3f7a0..3638692f8d9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1948,7 +1948,7 @@
         "description": "v3dv: do a better job at cleaning up the device on init failure",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index 5016f178d3c..d6f33af4c37 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -2016,6 +2016,9 @@ v3dv_CreateDevice(VkPhysicalDevice physicalDevice,
 fail:
    cnd_destroy(&device->query_ended);
    mtx_destroy(&device->query_mutex);
+   queue_finish(&device->queue);
+   destroy_device_meta(device);
+   v3dv_pipeline_cache_finish(&device->default_pipeline_cache);
    vk_device_finish(&device->vk);
    vk_free(&device->vk.alloc, device);