diff --git a/lib/peermgr/peermgr.go b/lib/peermgr/peermgr.go
index d275be3d5..8d6cf8cc3 100644
--- a/lib/peermgr/peermgr.go
+++ b/lib/peermgr/peermgr.go
@@ -51,9 +51,11 @@ type PeerMgr struct {
 	dht *dht.IpfsDHT
 
 	notifee *net.NotifyBundle
+
+	done chan struct{}
 }
 
-func NewPeerMgr(h host.Host, dht *dht.IpfsDHT, bootstrap dtypes.BootstrapPeers) *PeerMgr {
+func NewPeerMgr(lc fx.Lifecycle, h host.Host, dht *dht.IpfsDHT, bootstrap dtypes.BootstrapPeers) *PeerMgr {
 	pm := &PeerMgr{
 		h:             h,
 		dht:           dht,
@@ -64,8 +66,16 @@ func NewPeerMgr(h host.Host, dht *dht.IpfsDHT, bootstrap dtypes.BootstrapPeers)
 
 		maxFilPeers: MaxFilPeers,
 		minFilPeers: MinFilPeers,
+
+		done: make(chan struct{}),
 	}
 
+	lc.Append(fx.Hook{
+		OnStop: func(ctx context.Context) error {
+			return pm.Stop(ctx)
+		},
+	})
+
 	pm.notifee = &net.NotifyBundle{
 		DisconnectedF: func(_ net.Network, c net.Conn) {
 			pm.Disconnect(c.RemotePeer())
@@ -107,6 +117,12 @@ func (pmgr *PeerMgr) Disconnect(p peer.ID) {
 	}
 }
 
+func (pmgr *PeerMgr) Stop(ctx context.Context) error {
+	log.Warn("closing peermgr done")
+	close(pmgr.done)
+	return nil
+}
+
 func (pmgr *PeerMgr) Run(ctx context.Context) {
 	tick := build.Clock.Ticker(time.Second * 5)
 	for {
@@ -119,6 +135,9 @@ func (pmgr *PeerMgr) Run(ctx context.Context) {
 				log.Debug("peer count about threshold: %d > %d", pcount, pmgr.maxFilPeers)
 			}
 			stats.Record(ctx, metrics.PeerCount.M(int64(pmgr.getPeerCount())))
+		case <-pmgr.done:
+			log.Warn("exiting peermgr run")
+			return
 		}
 	}
 }
diff --git a/miner/miner.go b/miner/miner.go
index ba2a69d6e..d418c03f0 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -91,12 +91,13 @@ func (m *Miner) Start(ctx context.Context) error {
 
 func (m *Miner) Stop(ctx context.Context) error {
 	m.lk.Lock()
-	defer m.lk.Unlock()
 
 	m.stopping = make(chan struct{})
 	stopping := m.stopping
 	close(m.stop)
 
+	m.lk.Unlock()
+
 	select {
 	case <-stopping:
 		return nil