diff --git a/packages/rspack-cli/src/cli.ts b/packages/rspack-cli/src/cli.ts
index 9691d62d6b86..fe04d008d8c7 100644
--- a/packages/rspack-cli/src/cli.ts
+++ b/packages/rspack-cli/src/cli.ts
@@ -41,14 +41,19 @@ export class RspackCLI {
     program.version(RSPACK_CLI_VERSION);
   }
 
-  async createCompiler(
+  async buildCompilerConfig(
     options: CommonOptionsForBuildAndServe,
     rspackCommand: Command,
-    callback?: (e: Error | null, res?: Stats | MultiStats) => void,
   ) {
     let { config, pathMap } = await this.loadConfig(options);
     config = await this.buildConfig(config, pathMap, options, rspackCommand);
+    return config;
+  }
 
+  async createCompiler(
+    config: RspackOptions | MultiRspackOptions,
+    callback?: (e: Error | null, res?: Stats | MultiStats) => void,
+  ) {
     const isWatch = Array.isArray(config)
       ? (config as MultiRspackOptions).some((i) => i.watch)
       : (config as RspackOptions).watch;
diff --git a/packages/rspack-cli/src/commands/build.ts b/packages/rspack-cli/src/commands/build.ts
index 1b99e3af96f3..8ad8f6d19676 100644
--- a/packages/rspack-cli/src/commands/build.ts
+++ b/packages/rspack-cli/src/commands/build.ts
@@ -95,7 +95,8 @@ async function runBuild(cli: RspackCLI, options: BuildOptions): Promise<void> {
     }
   };
 
-  const compiler = await cli.createCompiler(options, 'build', errorHandler);
+  const userOption = await cli.buildCompilerConfig(options, 'build');
+  const compiler = await cli.createCompiler(userOption, errorHandler);
 
   if (!compiler || cli.isWatch(compiler)) {
     return;
diff --git a/packages/rspack-cli/src/commands/serve.ts b/packages/rspack-cli/src/commands/serve.ts
index 33ad6c293a88..4b1cf0a00047 100644
--- a/packages/rspack-cli/src/commands/serve.ts
+++ b/packages/rspack-cli/src/commands/serve.ts
@@ -1,4 +1,4 @@
-import type { Compiler } from '@rspack/core';
+import type { Compiler, MultiRspackOptions } from '@rspack/core';
 import type { RspackDevServer as RspackDevServerType } from '@rspack/dev-server';
 import type { RspackCLI } from '../cli';
 import { DEFAULT_SERVER_HOT } from '../constants';
@@ -51,14 +51,17 @@ export class ServeCommand implements RspackCommand {
       // Lazy import @rspack/dev-server to avoid loading it on build mode
       const { RspackDevServer } = await import('@rspack/dev-server');
 
-      const compiler = await cli.createCompiler(cliOptions, 'serve');
+      const userConfig = await cli.buildCompilerConfig(cliOptions, 'serve');
+      const compiler = await cli.createCompiler(userConfig);
       if (!compiler) {
         return;
       }
+      const isMultiCompiler = cli.isMultipleCompiler(compiler);
 
-      const compilers = cli.isMultipleCompiler(compiler)
-        ? compiler.compilers
-        : [compiler];
+      const compilers = isMultiCompiler ? compiler.compilers : [compiler];
+      const userConfigs = isMultiCompiler
+        ? (userConfig as MultiRspackOptions)
+        : ([userConfig] as MultiRspackOptions);
 
       const possibleCompilers = compilers.filter(
         (compiler: Compiler) => compiler.options.devServer,
@@ -80,7 +83,8 @@ export class ServeCommand implements RspackCommand {
       /**
        * Rspack relies on devServer.hot to enable HMR
        */
-      for (const compiler of compilers) {
+      for (const [index, compiler] of compilers.entries()) {
+        const userConfig = userConfigs[index];
         const devServer = (compiler.options.devServer ??= {});
         const isWebAppOnly =
           compiler.platform.web &&
@@ -89,8 +93,8 @@ export class ServeCommand implements RspackCommand {
           !compiler.platform.electron &&
           !compiler.platform.webworker;
 
-        if (isWebAppOnly) {
-          compiler.options.lazyCompilation ??= {
+        if (isWebAppOnly && userConfig.lazyCompilation === undefined) {
+          compiler.options.lazyCompilation = {
             imports: true,
             entries: false,
           };