diff --git a/waku/v2/protocol/store/client_test.go b/waku/v2/protocol/store/client_test.go
index e02e904e..d6685a25 100644
--- a/waku/v2/protocol/store/client_test.go
+++ b/waku/v2/protocol/store/client_test.go
@@ -138,7 +138,6 @@ func TestStoreClient(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, hasNext)
 	require.True(t, response.IsComplete())
-	require.Len(t, response.messages, 0)
 
 	// Query messages with backward pagination
 	response, err = wakuStore.Query(ctx, FilterCriteria{ContentFilter: protocol.NewContentFilter(relay.DefaultWakuTopic, "test"), TimeStart: startTime, TimeEnd: endTime}, WithPaging(false, 2))
@@ -175,7 +174,6 @@ func TestStoreClient(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, hasNext)
 	require.True(t, response.IsComplete())
-	require.Len(t, response.messages, 0)
 
 	// No cursor should be returned if there are no messages that match the criteria
 	response, err = wakuStore.Query(ctx, FilterCriteria{ContentFilter: protocol.NewContentFilter(relay.DefaultWakuTopic, "no-messages"), TimeStart: startTime, TimeEnd: endTime}, WithPaging(true, 2))
diff --git a/waku/v2/protocol/store/result.go b/waku/v2/protocol/store/result.go
index 7bf2fa23..df6342db 100644
--- a/waku/v2/protocol/store/result.go
+++ b/waku/v2/protocol/store/result.go
@@ -45,8 +45,6 @@ func (r *Result) Next(ctx context.Context) (bool, error) {
 	}
 
 	if r.IsComplete() {
-		r.cursor = nil
-		r.messages = nil
 		return false, nil
 	}