diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
index a0d3868cc7283..f052eaa26e2fc 100644
--- a/packages/next/src/build/webpack-config.ts
+++ b/packages/next/src/build/webpack-config.ts
@@ -1100,6 +1100,7 @@ export default async function getBaseWebpackConfig(
       // let this alias hit before `next` alias.
       ...(isEdgeServer
         ? {
+            'next/dist/build': 'next/dist/esm/build',
             'next/dist/client': 'next/dist/esm/client',
             'next/dist/shared': 'next/dist/esm/shared',
             'next/dist/pages': 'next/dist/esm/pages',
diff --git a/packages/next/src/build/webpack/loaders/next-flight-loader/index.ts b/packages/next/src/build/webpack/loaders/next-flight-loader/index.ts
index e7d3285fd4f00..315b49d18cc78 100644
--- a/packages/next/src/build/webpack/loaders/next-flight-loader/index.ts
+++ b/packages/next/src/build/webpack/loaders/next-flight-loader/index.ts
@@ -5,6 +5,9 @@ import { getRSCModuleInformation } from '../../../analysis/get-page-static-info'
 import { getModuleBuildInfo } from '../get-module-build-info'
 
 const noopHeadPath = require.resolve('next/dist/client/components/noop-head')
+// For edge runtime it will be aliased to esm version by webpack
+const MODULE_PROXY_PATH =
+  'next/dist/build/webpack/loaders/next-flight-loader/module-proxy'
 
 export default function transformSource(
   this: any,
@@ -16,11 +19,6 @@ export default function transformSource(
     throw new Error('Expected source to have been transformed to a string.')
   }
 
-  const moduleProxy =
-    this._compiler.name === 'edge-server'
-      ? 'next/dist/esm/build/webpack/loaders/next-flight-loader/module-proxy'
-      : 'next/dist/build/webpack/loaders/next-flight-loader/module-proxy'
-
   // Assign the RSC meta information to buildInfo.
   // Exclude next internal files which are not marked as client files
   const buildInfo = getModuleBuildInfo(this._module)
@@ -62,7 +60,7 @@ export default function transformSource(
       }
 
       let esmSource = `\
-import { createProxy } from "${moduleProxy}"
+import { createProxy } from "${MODULE_PROXY_PATH}"
 const proxy = createProxy(String.raw\`${this.resourcePath}\`)
 
 // Accessing the __esModule property and exporting $$typeof are required here.
@@ -102,7 +100,7 @@ export { e${cnt++} as ${ref} };`
 
   this.callback(
     null,
-    source.replace(RSC_MOD_REF_PROXY_ALIAS, moduleProxy),
+    source.replace(RSC_MOD_REF_PROXY_ALIAS, MODULE_PROXY_PATH),
     sourceMap
   )
 }