diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index be7c3bf19da38668db9e1ec6f9e73a5b1fc6de60..dfa5d3e4f3dff8004b827aad24c04d5a2eb0fc4d 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -362,6 +362,9 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
      */
     glamor_egl_exchange_buffers(pixmap, exported);
 
+    /* Swap the devKind into the original pixmap, reflecting the bo's stride */
+    screen->ModifyPixmapHeader(pixmap, 0, 0, 0, 0, exported->devKind, NULL);
+
     screen->DestroyPixmap(exported);
 
     return TRUE;