diff --git a/.pick_status.json b/.pick_status.json
index c03b2cfb8a7..b1974ba2455 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4554,7 +4554,7 @@
         "description": "glxext: don't try zink if not enabled in mesa",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "7d9ea77b4598e23d4415b529924f1cbdca6e33bd",
         "notes": null
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index fd53e00b4cc..31e85113abf 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy)
 #endif /* HAVE_DRI3 */
       if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false))
          dpyPriv->dri2Display = dri2CreateDisplay(dpy);
+#if defined(HAVE_ZINK)
       if (!dpyPriv->dri3Display && !dpyPriv->dri2Display)
          try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) &&
                     !getenv("GALLIUM_DRIVER");
+#endif /* HAVE_ZINK */
    }
 #endif /* GLX_USE_DRM */
    if (glx_direct)