diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index 5f14d753c854..5c99230c73f0 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -140,21 +140,11 @@ export class {{classname}} extends runtime.BaseAPI {
             }
             {{/isContainer}}
             {{^isContainer}}
-            queryParameters['{{baseName}}'] = requestParameters['{{paramName}}'];
+{{>apisAssignQueryParam}}
             {{/isContainer}}
             {{/isExplode}}
             {{^isExplode}}
-            {{#isDateTimeType}}
-            queryParameters['{{baseName}}'] = (requestParameters['{{paramName}}'] as any).toISOString();
-            {{/isDateTimeType}}
-            {{^isDateTimeType}}
-            {{#isDateType}}
-            queryParameters['{{baseName}}'] = (requestParameters['{{paramName}}'] as any).toISOString().substring(0,10);
-            {{/isDateType}}
-            {{^isDateType}}
-            queryParameters['{{baseName}}'] = requestParameters['{{paramName}}'];
-            {{/isDateType}}
-            {{/isDateTimeType}}
+{{>apisAssignQueryParam}}
             {{/isExplode}}
         }
 
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apisAssignQueryParam.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apisAssignQueryParam.mustache
new file mode 100644
index 000000000000..8da37374eea1
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apisAssignQueryParam.mustache
@@ -0,0 +1,12 @@
+{{! Assign query parameters based on their type }}
+{{#isDateTimeType}}
+            queryParameters['{{baseName}}'] = (requestParameters['{{paramName}}'] as any).toISOString();
+{{/isDateTimeType}}
+{{^isDateTimeType}}
+{{#isDateType}}
+            queryParameters['{{baseName}}'] = (requestParameters['{{paramName}}'] as any).toISOString().substring(0,10);
+{{/isDateType}}
+{{^isDateType}}
+            queryParameters['{{baseName}}'] = requestParameters['{{paramName}}'];
+{{/isDateType}}
+{{/isDateTimeType}}