diff --git a/waku/node/delivery_service/send_service/send_service.nim b/waku/node/delivery_service/send_service/send_service.nim
index a3c44bc0c..e6d3a2eda 100644
--- a/waku/node/delivery_service/send_service/send_service.nim
+++ b/waku/node/delivery_service/send_service/send_service.nim
@@ -225,9 +225,12 @@ proc evaluateAndCleanUp(self: SendService) =
       it.state != DeliveryState.FailedToDeliver
   )
 
-  # remove propagated ephemeral messages as no store check is possible
+  # remove propagated messages when no store confirmation will follow
   self.taskCache.keepItIf(
-    not (it.isEphemeral() and it.state == DeliveryState.SuccessfullyPropagated)
+    not (
+      it.state == DeliveryState.SuccessfullyPropagated and
+      (it.isEphemeral() or not self.checkStoreForMessages)
+    )
   )
 
 proc trySendMessages(self: SendService) {.async.} =