diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 88b1e8e93..2c7866a79 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -359,6 +359,11 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
                               0, 0, width, height, 0, 0);
     FreeScratchGC(scratch_gc);
 
+    /* In case that the pixmap backing BO importer's command stream accidentally
+     * gets flushed first.
+     */
+    glFlush();
+
     /* Now, swap the tex/gbm/EGLImage/etc. of the exported pixmap into
      * the original pixmap struct.
      */