diff --git a/waku/v2/protocol/filter/waku_filter.go b/waku/v2/protocol/filter/waku_filter.go
index 795bf676..53b0705c 100644
--- a/waku/v2/protocol/filter/waku_filter.go
+++ b/waku/v2/protocol/filter/waku_filter.go
@@ -149,6 +149,12 @@ func (wf *WakuFilter) onRequest(s network.Stream) {
 func (wf *WakuFilter) pushMessage(subscriber Subscriber, msg *pb.WakuMessage) error {
 	pushRPC := &pb.FilterRPC{RequestId: subscriber.requestId, Push: &pb.MessagePush{Messages: []*pb.WakuMessage{msg}}}
 
+	// We connect first so dns4 addresses are resolved (NewStream does not do it)
+	err := wf.h.Connect(wf.ctx, wf.h.Peerstore().PeerInfo(subscriber.peer))
+	if err != nil {
+		return err
+	}
+
 	conn, err := wf.h.NewStream(wf.ctx, subscriber.peer, FilterID_v20beta1)
 	if err != nil {
 		wf.subscribers.FlagAsFailure(subscriber.peer)
@@ -233,6 +239,12 @@ func (wf *WakuFilter) requestSubscription(ctx context.Context, filter ContentFil
 		contentFilters = append(contentFilters, &pb.FilterRequest_ContentFilter{ContentTopic: ct})
 	}
 
+	// We connect first so dns4 addresses are resolved (NewStream does not do it)
+	err = wf.h.Connect(ctx, wf.h.Peerstore().PeerInfo(params.selectedPeer))
+	if err != nil {
+		return
+	}
+
 	request := pb.FilterRequest{
 		Subscribe:      true,
 		Topic:          filter.Topic,
@@ -267,8 +279,13 @@ func (wf *WakuFilter) requestSubscription(ctx context.Context, filter ContentFil
 }
 
 func (wf *WakuFilter) Unsubscribe(ctx context.Context, contentFilter ContentFilter, peer peer.ID) error {
-	conn, err := wf.h.NewStream(ctx, peer, FilterID_v20beta1)
+	// We connect first so dns4 addresses are resolved (NewStream does not do it)
+	err := wf.h.Connect(ctx, wf.h.Peerstore().PeerInfo(peer))
+	if err != nil {
+		return err
+	}
 
+	conn, err := wf.h.NewStream(ctx, peer, FilterID_v20beta1)
 	if err != nil {
 		return err
 	}
diff --git a/waku/v2/protocol/lightpush/waku_lightpush.go b/waku/v2/protocol/lightpush/waku_lightpush.go
index 1106ec25..d65ab7b3 100644
--- a/waku/v2/protocol/lightpush/waku_lightpush.go
+++ b/waku/v2/protocol/lightpush/waku_lightpush.go
@@ -145,6 +145,12 @@ func (wakuLP *WakuLightPush) request(ctx context.Context, req *pb.PushRequest, o
 		return nil, ErrInvalidId
 	}
 
+	// We connect first so dns4 addresses are resolved (NewStream does not do it)
+	err := wakuLP.h.Connect(ctx, wakuLP.h.Peerstore().PeerInfo(params.selectedPeer))
+	if err != nil {
+		return nil, err
+	}
+
 	connOpt, err := wakuLP.h.NewStream(ctx, params.selectedPeer, LightPushID_v20beta1)
 	if err != nil {
 		wakuLP.log.Info("failed to connect to remote peer", err)
diff --git a/waku/v2/protocol/store/waku_store.go b/waku/v2/protocol/store/waku_store.go
index 51c8c4da..9d245baa 100644
--- a/waku/v2/protocol/store/waku_store.go
+++ b/waku/v2/protocol/store/waku_store.go
@@ -523,6 +523,12 @@ func DefaultOptions() []HistoryRequestOption {
 func (store *WakuStore) queryFrom(ctx context.Context, q *pb.HistoryQuery, selectedPeer peer.ID, requestId []byte) (*pb.HistoryResponse, error) {
 	store.log.Info(fmt.Sprintf("Querying message history with peer %s", selectedPeer))
 
+	// We connect first so dns4 addresses are resolved (NewStream does not do it)
+	err := store.h.Connect(ctx, store.h.Peerstore().PeerInfo(selectedPeer))
+	if err != nil {
+		return nil, err
+	}
+
 	connOpt, err := store.h.NewStream(ctx, selectedPeer, StoreID_v20beta4)
 	if err != nil {
 		store.log.Error("Failed to connect to remote peer", err)