diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index 21a1b302da0..8a44eb2a5be 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -914,7 +914,8 @@ where
 	fn peer_disconnected(&self, their_node_id: &PublicKey) {
 		match self.message_recipients.lock().unwrap().remove(their_node_id) {
 			Some(OnionMessageRecipient::ConnectedPeer(..)) => {},
-			_ => debug_assert!(false),
+			Some(_) => debug_assert!(false),
+			None => {},
 		}
 	}