diff --git a/.changeset/early-kings-marry.md b/.changeset/early-kings-marry.md
new file mode 100644
index 000000000..2be85cc72
--- /dev/null
+++ b/.changeset/early-kings-marry.md
@@ -0,0 +1,5 @@
+---
+"swagger-typescript-api": patch
+---
+
+Add boolean type for `extract-request-params` in command configuration.
diff --git a/.changeset/easy-paths-check.md b/.changeset/easy-paths-check.md
new file mode 100644
index 000000000..297fc3f0d
--- /dev/null
+++ b/.changeset/easy-paths-check.md
@@ -0,0 +1,5 @@
+---
+"swagger-typescript-api": patch
+---
+
+Fix generateClient logic to exclude only 'no-client' argument.
diff --git a/.changeset/moody-dodos-brake.md b/.changeset/moody-dodos-brake.md
new file mode 100644
index 000000000..936c89364
--- /dev/null
+++ b/.changeset/moody-dodos-brake.md
@@ -0,0 +1,5 @@
+---
+"swagger-typescript-api": patch
+---
+
+Initialise `customConfig` to `undefined` in command run function.
diff --git a/index.ts b/index.ts
index 8882bcceb..1a82c58cb 100644
--- a/index.ts
+++ b/index.ts
@@ -146,6 +146,7 @@ const generateCommand = defineCommand({
       default: codeGenBaseConfig.enumNamesAsValues,
     },
     "extract-request-params": {
+      type: "boolean",
       description:
         "extract request params to data contract (Also combine path params and query params into one object)",
       default: codeGenBaseConfig.extractRequestParams,
@@ -280,7 +281,7 @@ const generateCommand = defineCommand({
     },
   },
   run: async ({ args }) => {
-    let customConfig;
+    let customConfig = undefined;
 
     if (args["custom-config"]) {
       try {
@@ -314,7 +315,7 @@ const generateCommand = defineCommand({
       extractResponseError: args["extract-response-error"],
       extractResponses: args["extract-responses"],
       fileName: args.name,
-      generateClient: !(args.axios || args["no-client"]),
+      generateClient: !args["no-client"],
       generateResponses: args.responses,
       generateRouteTypes: args["route-types"],
       generateUnionEnums: args["union-enums"],