diff --git a/src/output.c b/src/output.c
index a355b675..f34f7ac5 100644
--- a/src/output.c
+++ b/src/output.c
@@ -348,9 +348,10 @@ output_destroy_notify(struct wl_listener *listener, void *data)
 {
         struct output *output = wl_container_of(listener, output, destroy);
         wl_list_remove(&output->link);
+        wl_list_remove(&output->frame.link);
+        wl_list_remove(&output->destroy.link);
 }
 
-
 static void
 new_output_notify(struct wl_listener *listener, void *data)
 {