diff --git a/waku/node/delivery_service/recv_service/recv_service.nim b/waku/node/delivery_service/recv_service/recv_service.nim
index 5f8717100..9f01ac267 100644
--- a/waku/node/delivery_service/recv_service/recv_service.nim
+++ b/waku/node/delivery_service/recv_service/recv_service.nim
@@ -90,7 +90,7 @@ proc checkStore*(self: RecvService) {.async.} =
   ## delivers them via MessageReceivedEvent.
   self.endTimeToCheck = getNowInNanosecondTime()
 
-  var msgHashesInStore = newSeq[WakuMessageHash](0)
+  ## query store and deliver new recovered messages per subscribed topic
   for pubsubTopic, contentTopics in self.subscriptionManager.subscribedTopics:
     let storeResp: StoreQueryResponse = (
       await self.node.wakuStoreClient.queryToAny(
@@ -107,22 +107,21 @@ proc checkStore*(self: RecvService) {.async.} =
         pubsubTopic = pubsubTopic, cTopics = toSeq(contentTopics), error = $error
       continue
 
-    msgHashesInStore.add(storeResp.messages.mapIt(it.messageHash))
+    ## compare the msgHashes seen from the store vs the ones received directly
+    let msgHashesInStore = storeResp.messages.mapIt(it.messageHash)
+    let rxMsgHashes = self.recentReceivedMsgs.mapIt(it.msgHash)
+    let missedHashes: seq[WakuMessageHash] =
+      msgHashesInStore.filterIt(not rxMsgHashes.contains(it))
 
-  ## compare the msgHashes seen from the store vs the ones received directly
-  let rxMsgHashes = self.recentReceivedMsgs.mapIt(it.msgHash)
-  let missedHashes: seq[WakuMessageHash] =
-    msgHashesInStore.filterIt(not rxMsgHashes.contains(it))
-
-  ## Now retrieve the missing WakuMessages and deliver them
-  let missingMsgsRet = await self.getMissingMsgsFromStore(missedHashes)
-  if missingMsgsRet.isOk():
-    for msgTuple in missingMsgsRet.get():
-      if self.processIncomingMessageOfInterest(msgTuple.pubsubTopic, msgTuple.msg):
-        info "recv service store-recovered message",
-          msg_hash = shortLog(msgTuple.hash), pubsubTopic = msgTuple.pubsubTopic
-  else:
-    error "failed to retrieve missing messages: ", error = $missingMsgsRet.error
+    ## Now retrieve the missing WakuMessages and deliver them
+    let missingMsgsRet = await self.getMissingMsgsFromStore(missedHashes)
+    if missingMsgsRet.isOk():
+      for msgTuple in missingMsgsRet.get():
+        if self.processIncomingMessageOfInterest(msgTuple.pubsubTopic, msgTuple.msg):
+          info "recv service store-recovered message",
+            msg_hash = shortLog(msgTuple.hash), pubsubTopic = msgTuple.pubsubTopic
+    else:
+      error "failed to retrieve missing messages: ", error = $missingMsgsRet.error
 
   ## update next check times
   self.startTimeToCheck = self.endTimeToCheck