diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index c23f7107..0fe33dcf 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -2687,6 +2687,11 @@ weston_wm_window_configure(void *data)
 	uint32_t values[4];
 	int x, y, width, height;
 
+	if (window->configure_source) {
+		wl_event_source_remove(window->configure_source);
+		window->configure_source = NULL;
+	}
+
 	weston_wm_window_set_allow_commits(window, false);
 
 	weston_wm_window_get_child_position(window, &x, &y);
@@ -2709,8 +2714,6 @@ weston_wm_window_configure(void *data)
 				   XCB_CONFIG_WINDOW_HEIGHT,
 				   values);
 
-	window->configure_source = NULL;
-
 	weston_wm_window_schedule_repaint(window);
 }