diff --git a/VERSION b/VERSION
index 09a3acfa..ee6cdce3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.0
\ No newline at end of file
+0.6.1
diff --git a/flake.nix b/flake.nix
index 041db1d9..a457f78c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
           ];
           doCheck = false;
           # FIXME: This needs to be manually changed when updating modules.
-          vendorSha256 = "sha256-17E63+sejYDLkYH43J02cE8K4JjTYoi+kpMyEt+diFU=";
+          vendorSha256 = "sha256-o8SeaxD5CDhYqMEr7OtaD0CerwO9HAbA0IJnbDjSLBM=";
           # Fix for 'nix run' trying to execute 'go-waku'.
           meta = { mainProgram = "waku"; };
         };
diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index 6f33b38f..a5ec00e1 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -486,11 +486,11 @@ func (w *WakuNode) Stop() {
 	w.store.Stop()
 	w.legacyFilter.Stop()
 	w.filterFullnode.Stop()
-	w.peerExchange.Stop()
 
 	if w.opts.enableDiscV5 {
 		w.discoveryV5.Stop()
 	}
+	w.peerExchange.Stop()
 
 	w.peerConnector.Stop()