diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index c329f9e28..0a7abb4b0 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -1217,6 +1217,9 @@ proc start*(node: WakuNode) {.async.} =
   info "Node started successfully"
 
 proc stop*(node: WakuNode) {.async.} =
+  ## By stopping the switch we are stopping all the underlying mounted protocols
+  await node.switch.stop()
+
   node.peerManager.stop()
 
   if not node.wakuRlnRelay.isNil():
@@ -1228,9 +1231,6 @@ proc stop*(node: WakuNode) {.async.} =
   if not node.wakuArchive.isNil():
     await node.wakuArchive.stopWait()
 
-  ## By stopping the switch we are stopping all the underlying mounted protocols
-  await node.switch.stop()
-
   node.started = false
 
 proc isReady*(node: WakuNode): Future[bool] {.async: (raises: [Exception]).} =