diff --git a/clients/window.c b/clients/window.c
index 64d7fe38..103e0364 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1396,6 +1396,9 @@ surface_destroy(struct surface *surface)
 	if (surface->subsurface)
 		wl_subsurface_destroy(surface->subsurface);
 
+	if (surface->viewport)
+		wp_viewport_destroy(surface->viewport);
+
 	wl_surface_destroy(surface->surface);
 
 	if (surface->toysurface)