diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index 553545eedc690d05ef25fb144a9027c865320440..f58085a9c720ceef1ce85710042779752ee7d436 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -58,7 +58,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
   const pagePaths = await collectPages(pagesDir, config.pageExtensions)
   const pages = createPagesMapping(pagePaths, config.pageExtensions)
   const entrypoints = createEntrypoints(pages, config.target, buildId, config)
-  const configs: any = await Promise.all([
+  const configs: any = [
     getBaseWebpackConfig(dir, {
       buildId,
       isServer: false,
@@ -73,7 +73,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
       target: config.target,
       entrypoints: entrypoints.server,
     }),
-  ])
+  ]
 
   let result: CompilerResult = { warnings: [], errors: [] }
   if (config.target === 'serverless') {
diff --git a/packages/next/build/webpack-config.js b/packages/next/build/webpack-config.js
index 8b726b83681d0bd296393acd372c479f072155cc..1c117d48b19107e99fa9e9214d837bc412dec4ad 100644
--- a/packages/next/build/webpack-config.js
+++ b/packages/next/build/webpack-config.js
@@ -146,7 +146,7 @@ function optimizationConfig ({ dev, isServer, totalPages, target }) {
   return config
 }
 
-export default async function getBaseWebpackConfig (dir, { dev = false, isServer = false, buildId, config, target = 'server', entrypoints }) {
+export default function getBaseWebpackConfig (dir, { dev = false, isServer = false, buildId, config, target = 'server', entrypoints }) {
   const defaultLoaders = {
     babel: {
       loader: 'next-babel-loader',
diff --git a/packages/next/server/hot-reloader.js b/packages/next/server/hot-reloader.js
index b7676035048b4f187fd6c1423dcb8166444b55ca..baa6e37543655fe6dc8dc29e41530d2a32635679 100644
--- a/packages/next/server/hot-reloader.js
+++ b/packages/next/server/hot-reloader.js
@@ -168,10 +168,10 @@ export default class HotReloader {
     const pagePaths = await glob(`+(_app|_document).+(${this.config.pageExtensions.join('|')})`, { cwd: join(this.dir, 'pages') })
     const pages = createPagesMapping(pagePaths, this.config.pageExtensions)
     const entrypoints = createEntrypoints(pages, 'server', this.buildId, this.config)
-    return Promise.all([
+    return [
       getBaseWebpackConfig(this.dir, { dev: true, isServer: false, config: this.config, buildId: this.buildId, entrypoints: entrypoints.client }),
       getBaseWebpackConfig(this.dir, { dev: true, isServer: true, config: this.config, buildId: this.buildId, entrypoints: entrypoints.server })
-    ])
+    ]
   }
 
   async start () {