diff --git a/eth-node/bridge/geth/wakuv2.go b/eth-node/bridge/geth/wakuv2.go
index 2a28dd38d..3c48f012f 100644
--- a/eth-node/bridge/geth/wakuv2.go
+++ b/eth-node/bridge/geth/wakuv2.go
@@ -193,7 +193,7 @@ func (w *gethWakuV2Wrapper) RequestStoreMessages(ctx context.Context, peerID pee
 
 	query := store.FilterCriteria{
 		TimeStart:     proto.Int64(int64(r.From) * int64(time.Second)),
-		TimeEnd:       proto.Int64(int64(r.To) * int64(time.Second)),
+		TimeEnd:       proto.Int64(int64(time.Duration(r.To)*time.Second + time.Second - time.Nanosecond)),
 		ContentFilter: protocol.NewContentFilter(w.waku.GetPubsubTopic(r.PubsubTopic), contentTopics...),
 	}