diff --git a/src/ifs/wl_surface/commit_timeline.rs b/src/ifs/wl_surface/commit_timeline.rs
index 07d72e20..df6deb94 100644
--- a/src/ifs/wl_surface/commit_timeline.rs
+++ b/src/ifs/wl_surface/commit_timeline.rs
@@ -116,6 +116,9 @@ pub enum ClearReason {
 fn break_loops(list: &LinkedList<Entry>) {
     for entry in list.iter() {
         entry.link.take();
+        if let EntryKind::Commit(c) = &entry.kind {
+            c.wait_handles.take();
+        }
     }
 }