diff --git a/.pick_status.json b/.pick_status.json
index 6d63021d554..011ce1e7d98 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3714,7 +3714,7 @@
         "description": "egl/x11: don't leak device_name when choosing zink",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 14335e0b504..f2965c21065 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -1781,8 +1781,10 @@ platform_x11_finalize(_EGLDisplay *disp)
 
    if (!dri2_dpy->swrast) {
 #ifdef HAVE_WAYLAND_PLATFORM
-      if (dri2_dpy->kopper)
+      if (dri2_dpy->kopper) {
+         free(dri2_dpy->device_name);
          dri2_dpy->device_name = strdup("zink");
+      }
 #endif
 
       dri2_dpy->swap_available = true;