diff --git a/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache b/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache
index d84cdec5ff86..083db508ea9c 100644
--- a/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache
@@ -152,12 +152,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts b/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts
index d994fd35e982..8cd68167fc53 100644
--- a/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts
+++ b/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts
@@ -124,12 +124,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts
index 97a82f53c206..e966da8d1d45 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts
@@ -141,12 +141,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts
index c98b183b5b66..78a227a11bdb 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts
@@ -146,12 +146,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
index 97a82f53c206..e966da8d1d45 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
@@ -141,12 +141,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
index bea859c615bc..50ae1ea99f1b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
@@ -141,12 +141,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
index 97a82f53c206..e966da8d1d45 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
@@ -141,12 +141,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
index 97a82f53c206..e966da8d1d45 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
@@ -141,12 +141,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
index 97a82f53c206..e966da8d1d45 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
@@ -141,12 +141,7 @@ export class ObjectSerializer {
             return transformedData;
         } else if (type === "Date") {
             if (format == "date") {
-                let month = data.getMonth()+1
-                month = month < 10 ? "0" + month.toString() : month.toString()
-                let day = data.getDate();
-                day = day < 10 ? "0" + day.toString() : day.toString();
-
-                return data.getFullYear() + "-" + month + "-" + day;
+                return data.toISOString().substring(0,10);
             } else {
                 return data.toISOString();
             }