diff --git a/waku/v2/node/keepalive.go b/waku/v2/node/keepalive.go
index e6693a62..536c7b75 100644
--- a/waku/v2/node/keepalive.go
+++ b/waku/v2/node/keepalive.go
@@ -86,7 +86,9 @@ func (w *WakuNode) pingPeer(ctx context.Context, wg *sync.WaitGroup, peer peer.I
 			w.keepAliveMutex.Unlock()
 			logger.Debug("could not ping", zap.Error(res.Error))
 		} else {
+			w.keepAliveMutex.Lock()
 			delete(w.keepAliveFails, peer)
+			w.keepAliveMutex.Unlock()
 		}
 	case <-ctx.Done():
 		w.keepAliveMutex.Lock()