diff --git a/tm-monitor/eventmeter/eventmeter.go b/tm-monitor/eventmeter/eventmeter.go
index dea4c1b1f..d32882fb4 100644
--- a/tm-monitor/eventmeter/eventmeter.go
+++ b/tm-monitor/eventmeter/eventmeter.go
@@ -140,8 +140,9 @@ func (em *EventMeter) Start() error {
 	return nil
 }
 
+// Stop stops the EventMeter.
 func (em *EventMeter) Stop() {
-	<-em.quit
+	close(em.quit)
 
 	em.RegisterDisconnectCallback(nil) // so we don't try and reconnect
 	em.wsc.Stop()                      // close(wsc.Quit)
diff --git a/tm-monitor/monitor/node.go b/tm-monitor/monitor/node.go
index 72d404a4f..308428a2b 100644
--- a/tm-monitor/monitor/node.go
+++ b/tm-monitor/monitor/node.go
@@ -121,12 +121,7 @@ func (n *Node) Start() error {
 func (n *Node) Stop() {
 	n.Online = false
 
-	n.em.RegisterLatencyCallback(nil)
-	n.em.Unsubscribe(tmtypes.EventStringNewBlockHeader())
-	n.em.RegisterDisconnectCallback(nil)
-
-	// FIXME stop blocks at event_meter.go:140
-	// n.em.Stop()
+	n.em.Stop()
 
 	close(n.quit)
 }