diff --git a/.pick_status.json b/.pick_status.json
index bf56b1ab456..61ca144a120 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1039,7 +1039,7 @@
         "description": "loader: unregister special event in loader_dri3_drawable_fini",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3170b63314f14f0031cb95bd5ee3a4726f26b43b"
     },
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
index 5a97ce302a0..ad6f0b624b3 100644
--- a/src/loader/loader_dri3_helper.c
+++ b/src/loader/loader_dri3_helper.c
@@ -359,6 +359,15 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable *draw)
          dri3_free_render_buffer(draw, draw->buffers[i]);
    }
 
+   if (draw->special_event) {
+      xcb_void_cookie_t cookie =
+         xcb_present_select_input_checked(draw->conn, draw->eid, draw->drawable,
+                                          XCB_PRESENT_EVENT_MASK_NO_EVENT);
+
+      xcb_discard_reply(draw->conn, cookie.sequence);
+      xcb_unregister_for_special_event(draw->conn, draw->special_event);
+   }
+
    if (draw->region)
       xcb_xfixes_destroy_region(draw->conn, draw->region);