diff --git a/src/vulkan/wsi/wsi_common_headless.c b/src/vulkan/wsi/wsi_common_headless.c
index f907a44a88e..bb647816f64 100644
--- a/src/vulkan/wsi/wsi_common_headless.c
+++ b/src/vulkan/wsi/wsi_common_headless.c
@@ -471,12 +471,6 @@ wsi_headless_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
    chain->base.image_count = num_images;
    chain->extent = pCreateInfo->imageExtent;
    chain->vk_format = pCreateInfo->imageFormat;
-
-   result = wsi_configure_image(&chain->base, pCreateInfo,
-                                0, &chain->base.image_info);
-   if (result != VK_SUCCESS) {
-      goto fail;
-   }
    chain->base.image_info.create_mem = wsi_create_null_image_mem;
 
 
@@ -484,7 +478,7 @@ wsi_headless_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
       result = wsi_create_image(&chain->base, &chain->base.image_info,
                                 &chain->images[i].base);
       if (result != VK_SUCCESS)
-         return result;
+         goto fail;
 
       chain->images[i].busy = false;
    }