From 77ace0d772c0334adf5cd8d6c11f4317959425ad Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Tue, 20 Dec 2022 12:37:16 -0400
Subject: [PATCH] fix: nil paging info

---
 waku/v2/protocol/store/waku_store_client.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/waku/v2/protocol/store/waku_store_client.go b/waku/v2/protocol/store/waku_store_client.go
index 432897b6d..c360a6592 100644
--- a/waku/v2/protocol/store/waku_store_client.go
+++ b/waku/v2/protocol/store/waku_store_client.go
@@ -342,10 +342,16 @@ func (store *WakuStore) Next(ctx context.Context, r *Result) (*Result, error) {
 		return nil, errors.New("invalid cursor")
 	}
 
-	return &Result{
+	result := &Result{
 		Messages: response.Messages,
-		cursor:   response.PagingInfo.Cursor,
 		query:    q,
 		peerId:   r.PeerID(),
-	}, nil
+	}
+
+	if response.PagingInfo != nil {
+		result.cursor = response.PagingInfo.Cursor
+	}
+
+	return result, nil
+
 }