diff --git a/src/tasks/connector.rs b/src/tasks/connector.rs
index aed36666..f7960960 100644
--- a/src/tasks/connector.rs
+++ b/src/tasks/connector.rs
@@ -404,6 +404,7 @@ impl ConnectorHandler {
         }
         self.state
             .remove_output_scale(on.global.persistent.scale.get());
+        on.clear();
         let _ = self.state.remove_global(&global);
         let _ = self.state.remove_global(&tray);
         self.state.tree_changed();
diff --git a/src/tree/output.rs b/src/tree/output.rs
index 2da49494..06159db3 100644
--- a/src/tree/output.rs
+++ b/src/tree/output.rs
@@ -446,6 +446,9 @@ impl OutputNode {
         self.screencopies.clear();
         self.ext_copy_sessions.clear();
         self.ext_workspace_groups.clear();
+        self.latch_event.clear();
+        self.vblank_event.clear();
+        self.presentation_event.clear();
     }
 
     pub fn on_spaces_changed(self: &Rc<Self>) {