diff --git a/src/emulator/dataconnectEmulator.ts b/src/emulator/dataconnectEmulator.ts
index d27636a57ed..84fc5dac6a7 100644
--- a/src/emulator/dataconnectEmulator.ts
+++ b/src/emulator/dataconnectEmulator.ts
@@ -86,6 +86,8 @@ export class DataConnectEmulator implements EmulatorInstance {
         auto_download: this.args.auto_download,
         listen: listenSpecsToString(this.args.listen),
         config_dir: resolvedConfigDir,
+        enable_output_schema_extensions: true,
+        enable_output_generated_sdk: true,
       });
       this.usingExistingEmulator = false;
     }
diff --git a/src/emulator/downloadableEmulators.ts b/src/emulator/downloadableEmulators.ts
index 7a02d98320a..093d9e5e6be 100755
--- a/src/emulator/downloadableEmulators.ts
+++ b/src/emulator/downloadableEmulators.ts
@@ -292,9 +292,11 @@ const Commands: { [s in DownloadableEmulators]: DownloadableEmulatorCommand } =
     optionalArgs: [
       "listen",
       "config_dir",
-      "disable_sdk_generation",
-      "resolvers_emulator",
-      "rpc_retry_count",
+      "enable_output_schema_extensions",
+      "enable_output_generated_sdk",
+      // Additional flags that CLI shouldn't pass:
+      // rpc_retry_count,
+      // resolvers_emulator,
     ],
     joinArgs: true,
     shell: false,