diff --git a/src/compositor.c b/src/compositor.c
index 6ca297a..ff0f3ab 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -413,6 +413,12 @@
 
 	if (ev->surface->output_destroyed)
 		ev->surface->output_destroyed(ev->surface);
+
+	wl_list_remove(&ev->output_move_listener.link);
+	wl_list_remove(&ev->output_destroy_listener.link);
+
+	wl_list_init(&ev->output_move_listener.link);
+	wl_list_init(&ev->output_destroy_listener.link);
 }
 
 WL_EXPORT struct weston_view *