diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 62c5a641b..97fd503fc 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -703,8 +703,6 @@ when isMainModule:
     if conf.storenode != "":
       setStorePeer(node, conf.storenode)
     
-    if conf.persistMessages:
-      waitFor node.resume()
 
 
   # Relay setup
@@ -713,6 +711,10 @@ when isMainModule:
              rlnRelayEnabled = conf.rlnRelay,
              keepAlive = conf.keepAlive,
              relayMessages = conf.relay) # Indicates if node is capable to relay messages
+  
+  # Resume historical messages, this has to be called after the relay setup           
+  if conf.store and conf.persistMessages:
+    waitFor node.resume()
 
   if conf.staticnodes.len > 0:
     waitFor connectToNodes(node, conf.staticnodes)
@@ -761,4 +763,4 @@ when isMainModule:
     
     c_signal(SIGTERM, handleSigterm)
 
-  runForever()
\ No newline at end of file
+  runForever()