diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index e1474b3543d..6937e84d942 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1109,10 +1109,15 @@ create_dri_image(struct dri2_egl_surface *dri2_surf,
       modifiers = NULL;
    }
 
+   if (dri2_dpy->fd_render_gpu != dri2_dpy->fd_display_gpu) {
+      use_flags = 0;
+      modifiers = NULL;
+      num_modifiers = 0;
+   }
+
    dri2_surf->back->dri_image = dri_create_image_with_modifiers(
       dri2_dpy->dri_screen_render_gpu, dri2_surf->base.Width,
-      dri2_surf->base.Height, pipe_format,
-      (dri2_dpy->fd_render_gpu != dri2_dpy->fd_display_gpu) ? 0 : use_flags,
+      dri2_surf->base.Height, pipe_format, use_flags,
       modifiers, num_modifiers, NULL);
 
    if (surf_modifiers_count > 0) {