diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadway-server.c
index 86f0053a1c..77dd894714 100644
--- a/gdk/broadway/broadway-server.c
+++ b/gdk/broadway/broadway-server.c
@@ -1583,6 +1583,11 @@ broadway_server_window_update (BroadwayServer *server,
 						       window->width,
 						       window->height);
 
+  g_assert (window->width == cairo_image_surface_get_width (window->last_surface));
+  g_assert (window->width == cairo_image_surface_get_width (surface));
+  g_assert (window->height == cairo_image_surface_get_height (window->last_surface));
+  g_assert (window->height == cairo_image_surface_get_height (surface));
+
   if (server->output != NULL)
     {
       if (window->last_synced)
diff --git a/gdk/broadway/gdkeventsource.c b/gdk/broadway/gdkeventsource.c
index a4399c431e..a23da78dd0 100644
--- a/gdk/broadway/gdkeventsource.c
+++ b/gdk/broadway/gdkeventsource.c
@@ -256,10 +256,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
       {
 	window->x = message->configure_notify.x;
 	window->y = message->configure_notify.y;
-	window->width = message->configure_notify.width;
-	window->height = message->configure_notify.height;
-	_gdk_window_update_size (window);
-	_gdk_broadway_window_resize_surface (window);
 
 	event = gdk_event_new (GDK_CONFIGURE);
 	event->configure.window = g_object_ref (window);