diff --git a/src/get-peer-info.js b/src/get-peer-info.js
index 83135eebe4..122a8ddc6b 100644
--- a/src/get-peer-info.js
+++ b/src/get-peer-info.js
@@ -38,7 +38,12 @@ function getPeerInfo (peer, peerStore) {
 
   addr && peer.multiaddrs.add(addr)
 
-  return peerStore ? peerStore.put(peer, { replace: false }) : peer
+  if (peerStore) {
+    peerStore.addressBook.set(peer.id, peer.multiaddrs.toArray(), { replace: false })
+    peerStore.protoBook.set(peer.id, Array.from(peer.protocols), { replace: false })
+  }
+
+  return peer
 }
 
 /**