diff --git a/.pick_status.json b/.pick_status.json
index b75a8734281..e23a77d662f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
         "description": "glx: Assign unique serial number to GLXBadFBConfig error",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f39fd3dce72eaef59ab39a23b75030ef9efc2a40"
     },
diff --git a/src/glx/create_context.c b/src/glx/create_context.c
index 11c1466ddcd..2709c995ce9 100644
--- a/src/glx/create_context.c
+++ b/src/glx/create_context.c
@@ -124,6 +124,9 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
        * somehow on the client side. clean up the server resource and panic.
        */
       xcb_glx_destroy_context(c, xid);
+      /* increment dpy->request in order to give a unique serial number to the
+       * error */
+      XNoOp(dpy);
       __glXSendError(dpy, GLXBadFBConfig, xid, 0, False);
    } else {
       gc->xid = xid;