diff --git a/src/cli/setup.js b/src/cli/setup.js
index 6b08cf73c5..e55a6bb740 100644
--- a/src/cli/setup.js
+++ b/src/cli/setup.js
@@ -31,13 +31,13 @@ function setup(initConfig) {
 			}
 
 			prestart.loadConfig(configFile);
-			next();
-		},
-		function (next) {
+
 			if (!nconf.get('no-build')) {
 				build.buildAll(next);
+			} else {
+				setImmediate(next);
 			}
-		}
+		},
 	], function (err, data) {
 		// Disregard build step data
 		data = data[0];