diff --git a/src/gallium/drivers/zink/driinfo_zink.h b/src/gallium/drivers/zink/driinfo_zink.h
index d4ed3d73e09..cdf1596cce0 100644
--- a/src/gallium/drivers/zink/driinfo_zink.h
+++ b/src/gallium/drivers/zink/driinfo_zink.h
@@ -3,8 +3,6 @@
 DRI_CONF_SECTION_DEBUG
    DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(false)
    DRI_CONF_OPT_B(radeonsi_inline_uniforms, false, "Optimize shaders by replacing uniforms with literals")
-   DRI_CONF_OPT_B(disable_xcb_surface, false, \
-                  "disable ext")
 DRI_CONF_SECTION_END
 
 DRI_CONF_SECTION_PERFORMANCE
diff --git a/src/gallium/drivers/zink/zink_instance.py b/src/gallium/drivers/zink/zink_instance.py
index 663218aaa75..d65d502d3a6 100644
--- a/src/gallium/drivers/zink/zink_instance.py
+++ b/src/gallium/drivers/zink/zink_instance.py
@@ -46,7 +46,7 @@ EXTENSIONS = [
     Extension("VK_KHR_wayland_surface",
               conditions=["!display_dev"]),
     Extension("VK_KHR_xcb_surface",
-              conditions=["!instance_info->disable_xcb_surface && !display_dev"]),
+              conditions=["!display_dev"]),
     Extension("VK_KHR_win32_surface"),
 ]
 
@@ -82,7 +82,6 @@ struct zink_screen;
 
 struct zink_instance_info {
    uint32_t loader_version;
-   bool disable_xcb_surface;
 
 %for ext in extensions:
    bool have_${ext.name_with_vendor()};
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index c1c61ffbd88..4bf609130b0 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -2877,7 +2877,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
       //screen->driconf.inline_uniforms = driQueryOptionb(config->options, "radeonsi_inline_uniforms");
       screen->driconf.emulate_point_smooth = driQueryOptionb(config->options, "zink_emulate_point_smooth");
       screen->driconf.zink_shader_object_enable = driQueryOptionb(config->options, "zink_shader_object_enable");
-      screen->instance_info.disable_xcb_surface = driQueryOptionb(config->options, "disable_xcb_surface");
    }
 
    if (!zink_create_instance(screen, config->dev_major > 0 && config->dev_major < 255))
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 271d5135243..d0806bd2376 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -74,11 +74,6 @@ TODO: document the other workarounds.
             <option name="disable_arb_gpu_shader5" value="true" />
         </application>
 
-        <!-- using vulkan wsi for xservers causes deadlocks -->
-        <application name="Xwayland" executable="Xwayland">
-            <option name="disable_xcb_surface" value="true" />
-        </application>
-
         <application name="Unigine Heaven (32-bit)" executable="heaven_x86">
             <option name="allow_glsl_extension_directive_midshader" value="true" />
             <!-- remove dual_color_blend_by_location if 4.1 ever comes out -->