diff --git a/src/libp2p/Libp2p.Core/Discovery/PeerStore.cs b/src/libp2p/Libp2p.Core/Discovery/PeerStore.cs
index 4c3bccb6..aa7d849a 100644
--- a/src/libp2p/Libp2p.Core/Discovery/PeerStore.cs
+++ b/src/libp2p/Libp2p.Core/Discovery/PeerStore.cs
@@ -64,10 +64,11 @@ public PeerInfo GetPeerInfo(PeerId peerId)
     {
         return store.GetOrAdd(peerId, id => new PeerInfo());
     }
-}
 
-public class PeerInfo
-{
-    public ByteString SignedPeerRecord { get; set; }
-    public HashSet<Multiaddress>? Addrs { get; set; }
+    public class PeerInfo
+    {
+        public ByteString? SignedPeerRecord { get; set; }
+        public HashSet<Multiaddress>? Addrs { get; set; }
+    }
 }
+