diff --git a/controller/monitor.go b/controller/monitor.go
index 1e5c90a..302f755 100644
--- a/controller/monitor.go
+++ b/controller/monitor.go
@@ -332,6 +332,7 @@ func (m *MonitorMgr) Cleanup(app string, exit chan bool) {
 		case <-t.C:
 			glog.Infof("Cleaning up app %s", app)
 			m.Remove(app)
+			return
 		case <-exit:
 			return
 		}