diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 1ad82f05f..986628b40 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -130,10 +130,7 @@ const buildWebpackConfigs = builds.map(
       .value();
 
     const internalJs = [paths.src, ...paths.compilePackages];
-    const resolvedPolyfills = polyfills.map(polyfill => {
-      return require.resolve(polyfill, { paths: [process.cwd()] });
-    });
-    const entry = [...resolvedPolyfills, paths.clientEntry];
+    const entry = [paths.clientEntry];
     const devServerEntries = [
       `${require.resolve(
         'webpack-dev-server/client'
@@ -144,6 +141,11 @@ const buildWebpackConfigs = builds.map(
       entry.unshift(...devServerEntries);
     }
 
+    const resolvedPolyfills = polyfills.map(polyfill => {
+      return require.resolve(polyfill, { paths: [process.cwd()] });
+    });
+    entry.unshift(...resolvedPolyfills);
+
     const publicPath = args.script === 'start' ? '/' : paths.publicPath;
 
     return [
diff --git a/config/webpack/webpack.config.ssr.js b/config/webpack/webpack.config.ssr.js
index 6600885e2..2543d4c22 100644
--- a/config/webpack/webpack.config.ssr.js
+++ b/config/webpack/webpack.config.ssr.js
@@ -136,11 +136,7 @@ const buildWebpackConfigs = builds.map(
 
     const isStartScript = args.script === 'start-ssr';
 
-    const resolvedPolyfills = polyfills.map(polyfill => {
-      return require.resolve(polyfill, { paths: [process.cwd()] });
-    });
-
-    const clientEntry = [...resolvedPolyfills, paths.clientEntry];
+    const clientEntry = [paths.clientEntry];
     const clientDevServerEntries = [
       'react-hot-loader/patch',
       `${require.resolve('webpack-dev-server/client')}?http://localhost:${
@@ -164,6 +160,11 @@ const buildWebpackConfigs = builds.map(
       serverEntry.unshift(...serverDevServerEntries);
     }
 
+    const resolvedPolyfills = polyfills.map(polyfill => {
+      return require.resolve(polyfill, { paths: [process.cwd()] });
+    });
+    clientEntry.unshift(...resolvedPolyfills);
+
     return [
       {
         entry: clientEntry,