diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 27ea952..6e32e1a 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -644,6 +644,9 @@ dri2_wait_x(struct glx_context *gc)
    struct dri2_drawable *priv = (struct dri2_drawable *)
       GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable);
 
+   if (gc->currentDpy != NULL)
+      XSync(gc->currentDpy, False);
+
    if (priv == NULL || !priv->have_fake_front)
       return;