diff --git a/src/bundlers/webpack/scripts/serve.ts b/src/bundlers/webpack/scripts/serve.ts index 9dfa0cc43f..245e25fdc6 100644 --- a/src/bundlers/webpack/scripts/serve.ts +++ b/src/bundlers/webpack/scripts/serve.ts @@ -9,7 +9,7 @@ const router = express.Router(); type ServeAdminType = (options: { payload: Payload }) => Promise; export const serveAdmin: ServeAdminType = async ({ payload }) => { - router.use(payload.config.routes.admin, history()); + router.use(history()); router.get('*', (req, res, next) => { if (req.path.substr(-1) === '/' && req.path.length > 1) { diff --git a/src/express/admin.ts b/src/express/admin.ts index 9cc0156228..a8b6b20ae0 100644 --- a/src/express/admin.ts +++ b/src/express/admin.ts @@ -3,7 +3,7 @@ import { Payload } from '../payload'; async function initAdmin(ctx: Payload): Promise { if (!ctx.config.admin.disable) { if (process.env.NODE_ENV === 'production') { - ctx.express.use(await ctx.config.admin.bundler.serve(ctx)); + 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)); }