diff --git a/exchange/bitswap/notifications/notifications.go b/exchange/bitswap/notifications/notifications.go
index defea700a..9a6f10b52 100644
--- a/exchange/bitswap/notifications/notifications.go
+++ b/exchange/bitswap/notifications/notifications.go
@@ -36,6 +36,16 @@ type impl struct {
 }
 
 func (ps *impl) Publish(block blocks.Block) {
+	ps.wg.Add(1)
+	defer ps.wg.Done()
+
+	select {
+	case <-ps.cancel:
+		// Already shutdown, bail.
+		return
+	default:
+	}
+
 	ps.wrapped.Pub(block, block.Cid().KeyString())
 }