diff --git a/dlc-messages/Cargo.toml b/dlc-messages/Cargo.toml
index 4d03d597..631b1ce4 100644
--- a/dlc-messages/Cargo.toml
+++ b/dlc-messages/Cargo.toml
@@ -16,6 +16,7 @@ dlc = {version = "0.4.0", path = "../dlc"}
 lightning = {version = "0.0.114"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
 serde = {version = "1.0", features = ["derive"], optional = true}
+log = "0.4.14"
 
 [dev-dependencies]
 bitcoin = {version = "0.29.2"}
diff --git a/dlc-messages/src/message_handler.rs b/dlc-messages/src/message_handler.rs
index 34228bb1..a89d735f 100644
--- a/dlc-messages/src/message_handler.rs
+++ b/dlc-messages/src/message_handler.rs
@@ -38,6 +38,25 @@ impl Default for MessageHandler {
     }
 }
 
+impl lightning::util::events::OnionMessageProvider for MessageHandler {
+    fn next_onion_message_for_peer(&self, _peer_node_id: PublicKey) -> Option<lightning::ln::msgs::OnionMessage> { None }
+}
+
+impl lightning::ln::msgs::OnionMessageHandler for MessageHandler {
+    fn handle_onion_message(&self, _their_node_id: &PublicKey, _msg: &lightning::ln::msgs::OnionMessage) {}
+    fn peer_connected(&self, _their_node_id: &PublicKey, _init: &lightning::ln::msgs::Init, _inbound: bool) -> Result<(), ()> { Ok(()) }
+    fn peer_disconnected(&self, their_node_id: &PublicKey) {
+        // In case the the peer is disconnected, but messages have already been received. It could happen that our retry logic interferes with
+        // pending unprocessed messages. see also https://github.com/get10101/10101/issues/792. To be on the safe side we are clearing any
+        // received, but unprocessed messages for that peer upon a disconnected.
+        self.clear_received_messages_by_node(their_node_id);
+    }
+    fn provided_node_features(&self) -> lightning::ln::features::NodeFeatures { lightning::ln::features::NodeFeatures::empty() }
+    fn provided_init_features(&self, _their_node_id: &PublicKey) -> lightning::ln::features::InitFeatures {
+        lightning::ln::features::InitFeatures::empty()
+    }
+}
+
 impl MessageHandler {
     /// Creates a new instance of a [`MessageHandler`]
     pub fn new() -> Self {
@@ -56,6 +75,17 @@ impl MessageHandler {
         ret
     }
 
+    /// Clears all messages received by the given node.
+    pub fn clear_received_messages_by_node(&self, node: &PublicKey) {
+        let messages = &mut *self.msg_received.lock().unwrap();
+        let before = messages.len();
+        messages.retain(|(pubkey, message) | {
+            !(pubkey.eq(node) && (matches!(message, Message::SubChannel(SubChannelMessage::Confirm(_))) || matches!(message, Message::SubChannel(SubChannelMessage::CloseConfirm(_)))))
+        });
+        let message_count = before - messages.len();
+        log::warn!("Cleared {message_count} received messages from node: {node} after disconnect.");
+    }
+
     /// Send a message to the peer with given node id. Not that the message is not
     /// sent right away, but only when the LDK
     /// [`lightning::ln::peer_handler::PeerManager::process_events`] is next called.