diff --git a/.pick_status.json b/.pick_status.json
index fe4941e37eb..ea34ca848d3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -694,7 +694,7 @@
         "description": "wsi/headless: Override finish_create",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "579578f10acda284c39cab2b12ccb8de2d2f793c",
         "notes": null
diff --git a/src/vulkan/wsi/wsi_common_headless.c b/src/vulkan/wsi/wsi_common_headless.c
index bb647816f64..7fff55b21ed 100644
--- a/src/vulkan/wsi/wsi_common_headless.c
+++ b/src/vulkan/wsi/wsi_common_headless.c
@@ -472,6 +472,7 @@ wsi_headless_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
    chain->extent = pCreateInfo->imageExtent;
    chain->vk_format = pCreateInfo->imageFormat;
    chain->base.image_info.create_mem = wsi_create_null_image_mem;
+   chain->base.image_info.finish_create = NULL;
 
 
    for (uint32_t i = 0; i < chain->base.image_count; i++) {