diff --git a/lib/build.js b/lib/build.js
index cfff63893a..2439a30aee 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -259,7 +259,7 @@ async function generateRoutesAndFiles () {
   }))
 
   // Interpret and move template files to .nuxt/
-  return templatesFiles.map(async ({src, dst, options, custom}) => {
+  return Promise.all(templatesFiles.map(async ({src, dst, options, custom}) => {
     // Add template to watchers
     this.options.build.watch.push(src)
     // Render template to dst
@@ -284,7 +284,7 @@ async function generateRoutesAndFiles () {
     // Fix webpack loop (https://github.com/webpack/watchpack/issues/25#issuecomment-287789288)
     const dateFS = Date.now() / 1000 - 30
     return utimes(path, dateFS, dateFS)
-  })
+  }))
 }
 
 function createRoutes (files, srcDir) {