diff --git a/src/endpoint.rs b/src/endpoint.rs
index 77d7468..f30b25e 100644
--- a/src/endpoint.rs
+++ b/src/endpoint.rs
@@ -120,7 +120,7 @@ pub(crate) type DynEndpoint = Box<dyn GenericEndpoint + Send + Sync>;
 #[async_trait]
 pub(crate) trait GenericEndpoint {
 	async fn handle(&self, buf: &[u8], from: NodeID) -> Result<Vec<u8>, Error>;
-	fn clear_handler(&self);
+	fn drop_handler(&self);
 	fn clone_endpoint(&self) -> DynEndpoint;
 }
 
@@ -148,7 +148,7 @@ where
 		}
 	}
 
-	fn clear_handler(&self) {
+	fn drop_handler(&self) {
 		self.0.handler.swap(None);
 	}
 
diff --git a/src/netapp.rs b/src/netapp.rs
index a7a3acf..8c0b50c 100644
--- a/src/netapp.rs
+++ b/src/netapp.rs
@@ -243,6 +243,15 @@ impl NetApp {
 			.log_err("Failed to await for connection collector");
 	}
 
+	/// Drop all endpoint handlers
+	///
+	/// Use this when terminating to break reference cycles
+	pub fn drop_all_handlers(&self) {
+		for (_, endpoint) in self.endpoints.read().unwrap().iter() {
+			endpoint.drop_handler();
+		}
+	}
+
 	/// Attempt to connect to a peer, given by its ip:port and its public key.
 	/// The public key will be checked during the secret handshake process.
 	/// This function returns once the connection has been established and a