diff --git a/main.go b/main.go
index 9e6bfca5..52c0b80d 100644
--- a/main.go
+++ b/main.go
@@ -331,8 +331,8 @@ func main() {
 		// Start cron style apps to run periodically
 		if cli.ShouldMistCleanup() {
 			app := "mist-cleanup.sh"
-			// schedule mist-cleanup every 2hrs with a timeout of 15min
-			mistCleanup, err := middleware.NewShell(2*60*60*time.Second, 15*60*time.Second, app)
+			// schedule mist-cleanup every 15min with a timeout of 15min
+			mistCleanup, err := middleware.NewShell(15*60*time.Second, 15*60*time.Second-10, app)
 			if err != nil {
 				glog.Info("Failed to shell out:", app, err)
 			}