diff --git a/src/lib/waku_store/index.ts b/src/lib/waku_store/index.ts
index 4a67dc70ee..317097aa55 100644
--- a/src/lib/waku_store/index.ts
+++ b/src/lib/waku_store/index.ts
@@ -217,6 +217,7 @@ export class WakuStore {
 
       if (!reply.response) {
         dbg("No message returned from store: `response` field missing");
+        return messages;
       }
 
       const response = reply.response as protoV2Beta4.HistoryResponse;