diff --git a/core/topology/server.go b/core/topology/server.go
index 50e73ed26e..c98aa6d4b4 100644
--- a/core/topology/server.go
+++ b/core/topology/server.go
@@ -251,6 +251,8 @@ func (s *Server) update() {
 	defer s.closewg.Done()
 	heartbeatTicker := time.NewTicker(s.cfg.heartbeatInterval)
 	rateLimiter := time.NewTicker(minHeartbeatInterval)
+	defer heartbeatTicker.Stop()
+	defer rateLimiter.Stop()
 	checkNow := s.checkNow
 	done := s.done