diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 784caee8..63593771 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1872,6 +1872,10 @@ sna_dri2_xchg(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
 	front->name = back->name;
 	back->name = tmp;
 
+	tmp = front->pitch;
+	front->pitch = back->pitch;
+	back->pitch = tmp;
+
 	assert(front_bo->refcnt);
 	assert(back_bo->refcnt);