diff --git a/plugins/platforms/wayland/egl_wayland_backend.cpp b/plugins/platforms/wayland/egl_wayland_backend.cpp
--- a/plugins/platforms/wayland/egl_wayland_backend.cpp
+++ b/plugins/platforms/wayland/egl_wayland_backend.cpp
@@ -288,7 +288,6 @@
 
 void EglWaylandBackend::presentOnSurface(EglWaylandOutput *output)
 {
-    output->m_waylandOutput->surface()->setupFrameCallback();
     Compositor::self()->aboutToSwapBuffers();
 
     if (supportsBufferAge()) {
@@ -298,6 +297,7 @@
         eglSwapBuffers(eglDisplay(), output->m_eglSurface);
     }
 
+    Compositor::self()->bufferSwapComplete();
 }
 
 void EglWaylandBackend::screenGeometryChanged(const QSize &size)