diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 9e38d701..1432c120 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -391,8 +391,6 @@ static void wlr_surface_flush_damage(struct wlr_surface *surface,
 release:
 	pixman_region32_clear(&surface->current->surface_damage);
 	pixman_region32_clear(&surface->current->buffer_damage);
-
-	wlr_surface_state_release_buffer(surface->current);
 }
 
 static void wlr_surface_commit_pending(struct wlr_surface *surface) {
@@ -428,6 +426,8 @@ static void wlr_surface_commit_pending(struct wlr_surface *surface) {
 
 	// TODO: add the invalid bitfield to this callback
 	wl_signal_emit(&surface->events.commit, surface);
+
+	wlr_surface_state_release_buffer(surface->current);
 }
 
 static bool wlr_subsurface_is_synchronized(struct wlr_subsurface *subsurface) {