diff --git a/main.go b/main.go
index 57dd1100..ff2068db 100644
--- a/main.go
+++ b/main.go
@@ -99,7 +99,10 @@ func run(c *cli.Context) {
 		startchan := make(chan struct{}) // start signal
 		go func() { startchan <- struct{}{} }()
 		file := c.String("file")
-		configchan := ConfigWatch(file)
+		configchan := make(chan bool)
+		if !c.Bool("no-watch") {
+			configchan = ConfigWatch(file)
+		}
 		log.Printf("Etcd: Starting...")
 		etcdchan := etcdO.EtcdWatch()
 		first := true // first loop or not