diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index a639d192554..d51ecc6ee36 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -735,10 +735,13 @@ where
 		&self, contents: T, destination: Destination, reply_path: Option<BlindedPath>,
 		log_suffix: fmt::Arguments
 	) -> Result<SendSuccess, SendError> {
-		let intro_node_logger =
-			WithContext::from(&self.logger, Some(destination.first_node()), None);
+		let mut log_wrapper = WithContext::from(&self.logger, None, None);
 		let result = self.find_path(destination)
-			.and_then(|path| self.enqueue_onion_message(path, contents, reply_path, log_suffix));
+			.and_then(|path| {
+				let first_hop = path.intermediate_nodes.get(0).map(|p| *p);
+				log_wrapper = WithContext::from(&self.logger, first_hop, None);
+				self.enqueue_onion_message(path, contents, reply_path, log_suffix)
+			});
 
 		match result.as_ref() {
 			Err(SendError::GetNodeIdFailed) => {
@@ -751,11 +754,11 @@ where
 				log_trace!(self.logger, "Failed sending onion message {}: {:?}", log_suffix, e);
 			},
 			Ok(SendSuccess::Buffered) => {
-				log_trace!(intro_node_logger, "Buffered onion message {}", log_suffix);
+				log_trace!(log_wrapper, "Buffered onion message {}", log_suffix);
 			},
 			Ok(SendSuccess::BufferedAwaitingConnection(node_id)) => {
 				log_trace!(
-					intro_node_logger,
+					log_wrapper,
 					"Buffered onion message waiting on peer connection {}: {}",
 					log_suffix, node_id
 				);