diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index 0b3cdfaa587..d95a3e90c24 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -239,6 +239,7 @@ __glXGetDrawableAttribute(Display * dpy, GLXDrawable drawable,
     *     generated."
     */
    if (drawable == 0) {
+      XNoOp(dpy);
       __glXSendError(dpy, GLXBadDrawable, 0, X_GLXGetDrawableAttributes, false);
       return 0;
    }
@@ -269,6 +270,7 @@ __glXGetDrawableAttribute(Display * dpy, GLXDrawable drawable,
       if (pdraw == NULL || gc == &dummyContext || gc->currentDpy != dpy ||
          (gc->currentDrawable != drawable &&
          gc->currentReadable != drawable)) {
+         XNoOp(dpy);
          __glXSendError(dpy, GLXBadDrawable, drawable,
                         X_GLXGetDrawableAttributes, false);
          return 0;