diff --git a/p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java b/p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
index dbdf7dbce3..b6d211378c 100644
--- a/p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
+++ b/p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
@@ -178,8 +178,19 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
     @Override
     public void readPersisted() {
         PeerList persistedPeerList = storage.initAndGetPersistedWithFileName("PeerList", 1000);
-        if (persistedPeerList != null)
+        if (persistedPeerList != null) {
+            long peesWithNoCapabilitiesSet = persistedPeerList.getList().stream()
+                    .filter(e -> e.getSupportedCapabilities().isEmpty())
+                    .mapToInt(e -> 1)
+                    .count();
+            if (peesWithNoCapabilitiesSet > 100) {
+                log.warn("peesWithNoCapabilitiesSet={}, persistedPeerList.size()={}", peesWithNoCapabilitiesSet, persistedPeerList.size());
+            } else {
+                log.info("peesWithNoCapabilitiesSet={}, persistedPeerList.size()={}", peesWithNoCapabilitiesSet, persistedPeerList.size());
+            }
+
             this.persistedPeers.addAll(persistedPeerList.getList());
+        }
     }
 
     public int getMaxConnections() {
@@ -648,7 +659,7 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
                 .filter(peer -> peer.getDate().getTime() > maxAge)
                 .collect(Collectors.toSet());
         if (oldNumLatestLivePeers != latestLivePeers.size())
-            log.info("Num of latestLivePeers={}, latestLivePeers={}", latestLivePeers.size(), latestLivePeers);
+            log.info("Num of latestLivePeers={}", latestLivePeers.size());
         return latestLivePeers;
     }
 
diff --git a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java b/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java
index bff3cb72b6..5459d10ea0 100644
--- a/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java
+++ b/p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java
@@ -64,9 +64,6 @@ public final class Peer implements NetworkPayload, PersistablePayload, Supported
         this.nodeAddress = nodeAddress;
         this.date = date;
         this.supportedCapabilities = supportedCapabilities;
-
-        if (supportedCapabilities.isEmpty())
-            log.warn("SupportedCapabilities is empty. nodeAddress={}", nodeAddress);
     }
 
     @Override