diff --git a/common/nym-lp/src/peer.rs b/common/nym-lp/src/peer.rs
index ecf9d230ad..39f0aca59c 100644
--- a/common/nym-lp/src/peer.rs
+++ b/common/nym-lp/src/peer.rs
@@ -132,7 +132,7 @@ impl Debug for LpLocalPeer {
                     "mlkem_public_key: {}",
                     match &self.mlkem {
                         Some(keypair) => format!("{:?}", keypair.1.as_ref()),
-                        None => format!("None"),
+                        None => "None".to_string(),
                     }
                 ),
             )
diff --git a/common/nym-lp/src/session.rs b/common/nym-lp/src/session.rs
index 8caf7e1171..385d348bab 100644
--- a/common/nym-lp/src/session.rs
+++ b/common/nym-lp/src/session.rs
@@ -306,17 +306,8 @@ impl LpSession {
 
     pub fn local_kem_encapsulation_key(&self, kem: &KEM) -> Option<Arc<EncapsulationKey>> {
         match kem {
-            KEM::MlKem768 => self
-                .local_peer
-                .mlkem
-                .as_ref()
-                .and_then(|x| Some(x.1.clone())),
-            KEM::McEliece => self
-                .local_peer
-                .mceliece
-                .as_ref()
-                .and_then(|x| Some(x.1.clone())),
-            KEM::X25519 => todo!(),
+            KEM::MlKem768 => self.local_peer.mlkem.as_ref().map(|x| x.1.clone()),
+            KEM::McEliece => self.local_peer.mceliece.as_ref().map(|x| x.1.clone()),
             _ => None,
         }
     }