diff --git a/waku/v2/api/publish/default_verifier.go b/waku/v2/api/publish/default_verifier.go
index 40c8e138..ae30563b 100644
--- a/waku/v2/api/publish/default_verifier.go
+++ b/waku/v2/api/publish/default_verifier.go
@@ -6,6 +6,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/waku-org/go-waku/waku/v2/protocol/pb"
 	"github.com/waku-org/go-waku/waku/v2/protocol/store"
+	"github.com/waku-org/go-waku/waku/v2/utils"
 )
 
 func NewDefaultStorenodeMessageVerifier(store *store.WakuStore) StorenodeMessageVerifier {
@@ -19,10 +20,12 @@ type defaultStorenodeMessageVerifier struct {
 }
 
 func (d *defaultStorenodeMessageVerifier) MessageHashesExist(ctx context.Context, requestID []byte, peerInfo peer.AddrInfo, pageSize uint64, messageHashes []pb.MessageHash) ([]pb.MessageHash, error) {
+
+	addrs := utils.EncapsulatePeerID(peerInfo.ID, peerInfo.Addrs...)
+
 	var opts []store.RequestOption
 	opts = append(opts, store.WithRequestID(requestID))
-	opts = append(opts, store.WithPeerAddr(peerInfo.Addrs...))
-	opts = append(opts, store.WithPeer(peerInfo.ID))
+	opts = append(opts, store.WithPeerAddr(addrs...))
 	opts = append(opts, store.WithPaging(false, pageSize))
 	opts = append(opts, store.IncludeData(false))