diff --git a/waku/v2/protocol/store/waku_store_client.go b/waku/v2/protocol/store/waku_store_client.go
index a4ba3936..432897b6 100644
--- a/waku/v2/protocol/store/waku_store_client.go
+++ b/waku/v2/protocol/store/waku_store_client.go
@@ -256,10 +256,13 @@ func (store *WakuStore) Query(ctx context.Context, query Query, opts ...HistoryR
 	result := &Result{
 		Messages: response.Messages,
 		query:    q,
-		cursor:   response.PagingInfo.Cursor,
 		peerId:   params.selectedPeer,
 	}
 
+	if response.PagingInfo != nil {
+		result.cursor = response.PagingInfo.Cursor
+	}
+
 	return result, nil
 }