diff --git a/distributions/nuxt/README.md b/distributions/nuxt/README.md
index d4ef64397a..d5ced3ef3d 100644
--- a/distributions/nuxt/README.md
+++ b/distributions/nuxt/README.md
@@ -99,7 +99,6 @@ It's as simple as that!
 
 Or you can start by using one of our starter templates:
 
-- [starter](https://github.com/nuxt-community/starter-template): Basic Nuxt.js project template
 - [express](https://github.com/nuxt-community/express-template): Nuxt.js + Express
 - [koa](https://github.com/nuxt-community/koa-template): Nuxt.js + Koa
 - [adonuxt](https://github.com/nuxt-community/adonuxt-template): Nuxt.js + AdonisJS
diff --git a/packages/cli/src/commands/build.js b/packages/cli/src/commands/build.js
index 35ce63b3d9..c0ecf210fe 100644
--- a/packages/cli/src/commands/build.js
+++ b/packages/cli/src/commands/build.js
@@ -62,6 +62,7 @@ export default {
   },
   async run (cmd) {
     const config = await cmd.getNuxtConfig({ dev: false, server: false, _build: true })
+    config.server = config.mode === 'spa' && cmd.argv.generate !== false
     const nuxt = await cmd.getNuxt(config)
 
     if (cmd.argv.lock) {
@@ -72,15 +73,14 @@ export default {
       }))
     }
 
-    if (nuxt.options.mode !== 'spa' || cmd.argv.generate === false) {
+    if (nuxt.options.mode === 'spa' && cmd.argv.generate !== false) {
+      // Build + Generate for static deployment
+      const generator = await cmd.getGenerator(nuxt)
+      await generator.generate({ build: true })
+    } else {
       // Build only
       const builder = await cmd.getBuilder(nuxt)
       await builder.build()
-      return
     }
-
-    // Build + Generate for static deployment
-    const generator = await cmd.getGenerator(nuxt)
-    await generator.generate({ build: true })
   }
 }