diff --git a/libp2p/protocols/secure/noise.nim b/libp2p/protocols/secure/noise.nim
index e4a4628..1a9cd5a 100644
--- a/libp2p/protocols/secure/noise.nim
+++ b/libp2p/protocols/secure/noise.nim
@@ -505,11 +505,13 @@ method handshake*(p: Noise, conn: Connection, initiator: bool): Future[SecureCon
           received_key = $remotePubKey
         raise newException(NoiseHandshakeError, "Noise handshake, peer infos don't match! " & $pid & " != " & $conn.peerInfo.peerId)
 
-    let peerInfo =
-      if conn.peerInfo != nil: conn.peerInfo
-      else: PeerInfo.init(remotePubKey)
+    conn.peerInfo =
+      if conn.peerInfo != nil:
+        conn.peerInfo
+      else:
+        PeerInfo.init(PeerID.init(remotePubKey).tryGet())
 
-    var tmp = NoiseConnection.init(conn, peerInfo, conn.observedAddr)
+    var tmp = NoiseConnection.init(conn, conn.peerInfo, conn.observedAddr)
 
     if initiator:
       tmp.readCs = handshakeRes.cs2
diff --git a/libp2p/protocols/secure/secio.nim b/libp2p/protocols/secure/secio.nim
index 71bcb4d..ff22d44 100644
--- a/libp2p/protocols/secure/secio.nim
+++ b/libp2p/protocols/secure/secio.nim
@@ -255,11 +255,13 @@ proc newSecioConn(conn: Connection,
   ## cipher algorithm ``cipher``, stretched keys ``secrets`` and order
   ## ``order``.
 
-  let peerInfo =
-    if conn.peerInfo != nil: conn.peerInfo
-    else: PeerInfo.init(remotePubKey)
+  conn.peerInfo =
+    if conn.peerInfo != nil:
+      conn.peerInfo
+    else:
+      PeerInfo.init(PeerID.init(remotePubKey).tryGet())
 
-  result = SecioConn.init(conn, peerInfo, conn.observedAddr)
+  result = SecioConn.init(conn, conn.peerInfo, conn.observedAddr)
 
   let i0 = if order < 0: 1 else: 0
   let i1 = if order < 0: 0 else: 1