diff --git a/main.go b/main.go
index 22ec436538..3f25da2129 100644
--- a/main.go
+++ b/main.go
@@ -240,7 +240,11 @@ func main() {
 
 	if *enableLeaderElection {
 		glog.Info("Waiting to be elected leader before starting application controller goroutines")
-		<-startCh
+		select {
+		case <-signalCh:
+			os.Exit(0)
+		case <-startCh:
+		}
 	}
 
 	glog.Info("Starting application controller goroutines")