diff --git a/src/bundlers/webpack/configs/dev.ts b/src/bundlers/webpack/configs/dev.ts
index 29a4507315..969a87c544 100644
--- a/src/bundlers/webpack/configs/dev.ts
+++ b/src/bundlers/webpack/configs/dev.ts
@@ -19,12 +19,12 @@ export const getDevConfig = (payloadConfig: SanitizedConfig): Configuration => {
     entry: {
       ...baseConfig.entry,
       main: [
-        require.resolve('webpack-hot-middleware/client'),
+        `webpack-hot-middleware/client?path=${payloadConfig.routes.admin}/__webpack_hmr`,
         ...(baseConfig.entry.main as string[]),
       ],
     },
     output: {
-      publicPath: payloadConfig.routes.admin,
+      publicPath: `${payloadConfig.routes.admin}/`,
       path: '/',
       filename: '[name].js',
     },
diff --git a/src/bundlers/webpack/scripts/dev.ts b/src/bundlers/webpack/scripts/dev.ts
index 531f31fcd3..35b279febb 100644
--- a/src/bundlers/webpack/scripts/dev.ts
+++ b/src/bundlers/webpack/scripts/dev.ts
@@ -11,14 +11,14 @@ const router = express.Router();
 
 type DevAdminType = (options: { payload: Payload }) => Promise<PayloadHandler>;
 export const devAdmin: DevAdminType = async ({ payload }) => {
-  payload.express.use(payload.config.routes.admin, history());
+  router.use(history());
 
   try {
     const webpackConfig = getDevConfig(payload.config);
     const compiler = webpack(webpackConfig);
 
     router.use(webpackDevMiddleware(compiler, {
-      publicPath: webpackConfig.output.publicPath as string,
+      publicPath: '/',
     }));
 
     router.use(webpackHotMiddleware(compiler));
diff --git a/src/express/admin.ts b/src/express/admin.ts
index a8b6b20ae0..aa1052a8ba 100644
--- a/src/express/admin.ts
+++ b/src/express/admin.ts
@@ -5,7 +5,7 @@ async function initAdmin(ctx: Payload): Promise<void> {
     if (process.env.NODE_ENV === 'production') {
       ctx.express.use(ctx.config.routes.admin, await ctx.config.admin.bundler.serve(ctx));
     } else {
-      ctx.express.use(await ctx.config.admin.bundler.dev(ctx));
+      ctx.express.use(ctx.config.routes.admin, await ctx.config.admin.bundler.dev(ctx));
     }
   }
 }