diff --git a/p2p/host.go b/p2p/host.go
index 5a22b3f5f4..e93b9c85e9 100644
--- a/p2p/host.go
+++ b/p2p/host.go
@@ -428,12 +428,16 @@ func NewHost(cfg HostConfig) (Host, error) {
 			subLogger.Error().Err(err).Str("addr", addr).Msg("invalid trusted node addr")
 			continue
 		}
+
 		info, err := libp2p_peer.AddrInfoFromP2pAddr(peerAddr)
 		if err != nil {
 			subLogger.Error().Err(err).Str("addr", addr).Msg("failed to parse trusted node")
 			continue
 		}
 		h.trustedPeerIDs[info.ID] = struct{}{}
+
+		ps.AddAddrs(info.ID, info.Addrs, libp2p_peerstore.PermanentAddrTTL)
+		subLogger.Info().Interface("peerAddr", peerAddr).Msg("trusted node added to peerstore")
 	}
 
 	utils.Logger().Info().
@@ -544,8 +548,6 @@ func (host *HostV2) Start() error {
 	for _, proto := range host.streamProtos {
 		proto.Start()
 	}
-	// add trusted nodes
-	host.AddTrustedNodes()
 	// start discovery
 	return host.discovery.Start()
 }
diff --git a/p2p/stream/common/streammanager/streammanager.go b/p2p/stream/common/streammanager/streammanager.go
index 8fd772501d..138701513f 100644
--- a/p2p/stream/common/streammanager/streammanager.go
+++ b/p2p/stream/common/streammanager/streammanager.go
@@ -526,6 +526,10 @@ func (sm *streamManager) discoverAndSetupStream(discCtx context.Context) (int, e
 					Msg("failed to setup stream with trusted peer")
 				return
 			}
+
+			sm.logger.Info().
+				Interface("peerID", pid).
+				Msg("new stream set up with trusted peer")
 		}(pid)
 	}
 
@@ -543,6 +547,10 @@ func (sm *streamManager) discoverAndSetupStream(discCtx context.Context) (int, e
 		if peer.ID == sm.host.ID() {
 			continue
 		}
+		if _, ok := sm.trustedPeers[peer.ID]; ok {
+			sm.logger.Info().Interface("peer", peer).Msg("skipping trusted peer")
+			continue
+		}
 		if sm.coolDownCache.Has(peer.ID) {
 			continue
 		}
@@ -563,6 +571,9 @@ func (sm *streamManager) discoverAndSetupStream(discCtx context.Context) (int, e
 					Msg("failed to setup stream with peer")
 				return
 			}
+			sm.logger.Info().
+				Interface("peerID", pid).
+				Msg("new stream set up with peer")
 		}(peer.ID)
 	}