diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go
index 9c7139459..3b4da21e9 100644
--- a/control/controlclient/auto.go
+++ b/control/controlclient/auto.go
@@ -702,6 +702,7 @@ func (c *Auto) Logout(ctx context.Context) error {
 	}
 	c.mu.Unlock()
 	c.cancelAuth()
+	c.cancelMap()
 
 	timer, timerChannel := c.clock.NewTimer(10 * time.Second)
 	defer timer.Stop()