diff --git a/bitswap/bitswap.go b/bitswap/bitswap.go
index c89b62136..cb1d0b9cb 100644
--- a/bitswap/bitswap.go
+++ b/bitswap/bitswap.go
@@ -180,6 +180,7 @@ func (bs *BitSwap) handleMessages() {
 				}
 			}
 		case <-bs.haltChan:
+			bs.notifications.Shutdown()
 			return
 		}
 	}