diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index e961fd72..1b0ad082 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -408,9 +408,9 @@ func (w *WakuNode) Stop() {
 
 	w.host.Close()
 
-	close(w.enrChangeCh)
-
 	w.wg.Wait()
+
+	close(w.enrChangeCh)
 }
 
 // Host returns the libp2p Host used by the WakuNode