diff --git a/src/cli/index.js b/src/cli/index.js
index 7362fe3847..6054fc51d0 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -167,7 +167,7 @@ program
 program
 	.command('setup [config]')
 	.description('Run the NodeBB setup script, or setup with an initial config')
-	.option('--no-build', 'Run setup without building assets')
+	.option('--skip-build', 'Run setup without building assets')
 	.action(function (initConfig) {
 		if (initConfig) {
 			try {
diff --git a/src/cli/setup.js b/src/cli/setup.js
index e55a6bb740..897356b945 100644
--- a/src/cli/setup.js
+++ b/src/cli/setup.js
@@ -32,7 +32,7 @@ function setup(initConfig) {
 
 			prestart.loadConfig(configFile);
 
-			if (!nconf.get('no-build')) {
+			if (!nconf.get('skip-build')) {
 				build.buildAll(next);
 			} else {
 				setImmediate(next);