diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index 9a9f8b6c..332a7d5f 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -164,16 +164,7 @@ func (w *WakuNode) processHostEvent(e interface{}) {
 	log.Debug("###ConnStatus isOnline: ", isOnline, "/", newIsOnline, " hasHistory: ",
 		hasHistory, "/", newHasHistory)
 	if w.connStatusChan != nil {
-
-		// Creating a copy of the current peers map
-		w.peersMutex.Lock()
-		p := make(PeerStats)
-		for k, v := range w.peers {
-			p[k] = v
-		}
-		w.peersMutex.Unlock()
-
-		connStatus := ConnStatus{IsOnline: newIsOnline, HasHistory: newHasHistory, Peers: p}
+		connStatus := ConnStatus{IsOnline: newIsOnline, HasHistory: newHasHistory, Peers: w.Peers()}
 		log.Debug("New ConnStatus: ", connStatus)
 		w.connStatusChan <- connStatus
 	}
@@ -733,6 +724,17 @@ func (w *WakuNode) PeerCount() int {
 	return len(w.peers)
 }
 
+func (w *WakuNode) Peers() PeerStats {
+	w.peersMutex.Lock()
+	defer w.peersMutex.Unlock()
+	p := make(PeerStats)
+	for k, v := range w.peers {
+		p[k] = v
+	}
+
+	return p
+}
+
 func (w *WakuNode) startKeepAlive(t time.Duration) {
 	log.Info("Setting up ping protocol with duration of ", t)