diff --git a/src/state.rs b/src/state.rs
index 1fb6235c..cea8f9a5 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -1068,6 +1068,7 @@ impl State {
         self.position_hint_requests.clear();
         self.head_managers.clear();
         self.head_managers_async.clear();
+        self.const_40hz_latch.clear();
     }
 
     pub fn remove_toplevel_id(&self, id: ToplevelIdentifier) {
diff --git a/src/utils/event_listener.rs b/src/utils/event_listener.rs
index 784ed72f..2bed98b1 100644
--- a/src/utils/event_listener.rs
+++ b/src/utils/event_listener.rs
@@ -25,6 +25,10 @@ impl<T: ?Sized> Default for EventSource<T> {
 }
 
 impl<T: ?Sized> EventSource<T> {
+    pub fn clear(&self) {
+        self.on_attach.take();
+    }
+
     pub fn iter(&self) -> EventSourceIter<T> {
         EventSourceIter {
             iter: self.listeners.iter(),