diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c
index 7073adb93..5e4e50e38 100644
--- a/client/X11/xf_client.c
+++ b/client/X11/xf_client.c
@@ -375,8 +375,8 @@ static BOOL xf_sw_desktop_resize(rdpContext* context)
 	}
 
 	if (!(xfc->image = XCreateImage(xfc->display, xfc->visual, xfc->depth, ZPixmap,
-	                                0,
-	                                (char*) gdi->primary_buffer, gdi->width, gdi->height, xfc->scanline_pad, 0)))
+	                                0, gdi->primary_buffer, gdi->width,
+	                                gdi->height, xfc->scanline_pad, gdi->stride)))
 	{
 		goto out;
 	}
@@ -627,7 +627,7 @@ BOOL xf_create_window(xfContext* xfc)
 		                          xfc->depth,
 		                          ZPixmap, 0, (char*) gdi->primary_buffer,
 		                          settings->DesktopWidth, settings->DesktopHeight,
-		                          xfc->scanline_pad, 0);
+		                          xfc->scanline_pad, gdi->stride);
 	}
 
 	return TRUE;