diff --git a/app/plugins/heartbeat.go b/app/plugins/heartbeat.go
index 9932497..bd75f4b 100644
--- a/app/plugins/heartbeat.go
+++ b/app/plugins/heartbeat.go
@@ -24,6 +24,7 @@ func (cr *heartbeat) Id() PluginID {
 
 func (a heartbeat) Shutdown() {
 	a.breakChan <- true
+	a.bus.Shutdown()
 }
 
 func (a *heartbeat) run() {
@@ -35,6 +36,7 @@ func (a *heartbeat) run() {
 			a.bus.Publish(event.NewEvent(event.Heartbeat, map[event.Field]string{}))
 			continue
 		case <-a.breakChan:
+			log.Debugf("shutting down heartbeat plugin")
 			return
 		}
 	}