diff --git a/implementations/Crafter.Graphics-Window.cpp b/implementations/Crafter.Graphics-Window.cpp
index d32dfd5..5b0efeb 100644
--- a/implementations/Crafter.Graphics-Window.cpp
+++ b/implementations/Crafter.Graphics-Window.cpp
@@ -725,10 +725,6 @@ void Window::Render() {
         Device::CheckVkResult(result);
     }
     Device::CheckVkResult(vkQueueWaitIdle(Device::queue));
-    #ifdef CRAFTER_GRAPHICS_WINDOW_WAYLAND
-    wl_surface_commit(surface);
-    wl_surface_damage(surface, 0, 0, 10000, 100000);
-    #endif
     #endif
 }
 
@@ -945,13 +941,14 @@ void Window::FinishInit() {
 #ifdef CRAFTER_GRAPHICS_WINDOW_WAYLAND
 void Window::wl_surface_frame_done(void* data, struct wl_callback *cb, uint32_t time) {
 	wl_callback_destroy(cb);
-    cb = nullptr;
 	Window* window = reinterpret_cast<Window*>(data);
 
     if(window->updating) {
-        window->Update();
         cb = wl_surface_frame(window->surface);
 	    wl_callback_add_listener(cb, &Window::wl_callback_listener, window);
+        window->Update();
+    } else {
+        cb = nullptr;
     }
 }