diff --git a/waku/v2/protocol/store/client.go b/waku/v2/protocol/store/client.go
index 0cbedec6..c8bea7f7 100644
--- a/waku/v2/protocol/store/client.go
+++ b/waku/v2/protocol/store/client.go
@@ -203,11 +203,21 @@ func (s *WakuStore) RequestRaw(ctx context.Context, peerInfo peer.AddrInfo, stor
 	}
 
 	var params Parameters
-	params.selectedPeer = peerInfo.ID
-	if params.selectedPeer == "" {
+	params.peerAddr = peerInfo.Addrs
+	if len(params.peerAddr) == 0 {
 		return nil, ErrMustSelectPeer
 	}
 
+	//Add Peer to peerstore.
+	if s.pm != nil && params.peerAddr != nil {
+		pData, err := s.pm.AddPeer(params.peerAddr, peerstore.Static, []string{}, StoreQueryID_v300)
+		if err != nil {
+			return nil, err
+		}
+		s.pm.Connect(pData)
+		params.selectedPeer = pData.AddrInfo.ID
+	}
+
 	response, err := s.queryFrom(ctx, storeRequest, &params)
 	if err != nil {
 		return nil, err