diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
index a207045ce0..edcb49a9be 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
@@ -39,6 +39,9 @@ async function generate(
     outputDirectory,
     OUTPUT_PATH,
   );
+  const additionalProperties = toGeneratorAdditionalProperties({
+    initialValue: clientAdditionalProperties,
+  });
 
   await fs.emptyDir(resolvedOutputDirectory);
 
@@ -65,11 +68,9 @@ async function generate(
       ),
       '--generator-key',
       'v3.0',
-      '--additional-properties',
-      toGeneratorAdditionalProperties({
-        defaultValue: { useTags: false },
-        initialValue: clientAdditionalProperties,
-      }),
+      additionalProperties
+        ? `--additional-properties=${additionalProperties}`
+        : '',
     ],
     {
       signal: abortSignal?.signal,
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
index ee52d255e9..8c342b0a68 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
@@ -30,7 +30,6 @@ import { resolvePackagePath } from '@backstage/backend-plugin-api';
 import {
   getPathToCurrentOpenApiSpec,
   getRelativePathToFile,
-  toGeneratorAdditionalProperties,
 } from '../../../../../lib/openapi/helpers';
 
 async function generateSpecFile() {
@@ -112,8 +111,6 @@ async function generate(abortSignal?: AbortController) {
       ),
       '--generator-key',
       'v3.0',
-      '--additional-properties',
-      toGeneratorAdditionalProperties({ defaultValue: { useTags: false } }),
     ],
     {
       maxBuffer: Number.MAX_VALUE,