diff --git a/bin/nuxt-build b/bin/nuxt-build
index 552d2a463b..04df6bb499 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -33,6 +33,7 @@ if (argv.help) {
       --analyze, -a        Launch webpack-bundle-analyzer to optimize your bundles.
       --spa                Launch in SPA mode
       --universal          Launch in Universal mode (default)
+      --no-generate        Don't generate static version for SPA mode (useful for nuxt start)
       --config-file, -c    Path to Nuxt.js config file (default: nuxt.config.js)
       --help, -h           Displays this message
   `)
@@ -65,8 +66,8 @@ const close = () => {
   process.exit(0)
 }
 
-if (options.mode !== 'spa') {
-  // -- Build for SSR app --
+if (options.mode !== 'spa' || argv.generate === false) {
+  // -- Build Only --
   builder
     .build()
     .then(() => debug('Building done'))