diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index fb03c08021..7ec852c14e 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -1992,6 +1992,10 @@ int vo_wayland_init(struct vo *vo)
     wl_callback_add_listener(wl->frame_callback, &frame_listener, wl);
     wl_surface_commit(wl->surface);
 
+    /* Do another roundtrip to ensure all of the above is initialized
+     * before mpv does anything else. */
+    wl_display_roundtrip(wl->display);
+
     return true;
 }