diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
index f4cfe923baa..c533c6739af 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/model.mustache
@@ -28,7 +28,7 @@ namespace {{package}} {
 {{#isEnum}}
 
         export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-            {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+            {{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
         }
 {{/isEnum}}
 {{/vars}}
diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
index 62f6760a6ec..a80aa388d2b 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -31,7 +31,7 @@ export namespace {{classname}} {
 {{#vars}}
 {{#isEnum}}
     export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-        {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+        {{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
     }
 {{/isEnum}}
 {{/vars}}
diff --git a/samples/client/petstore/typescript-angular/API/Client/Order.ts b/samples/client/petstore/typescript-angular/API/Client/Order.ts
index 1dd84e6d0ad..c01c6482810 100644
--- a/samples/client/petstore/typescript-angular/API/Client/Order.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Order.ts
@@ -26,7 +26,7 @@ namespace API.Client {
         export enum StatusEnum { 
             placed = <any> 'placed',
             approved = <any> 'approved',
-            delivered = <any> 'delivered',
+            delivered = <any> 'delivered'
         }
     }
 }
diff --git a/samples/client/petstore/typescript-angular/API/Client/Pet.ts b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
index 60431f69c83..d0702f8d0ec 100644
--- a/samples/client/petstore/typescript-angular/API/Client/Pet.ts
+++ b/samples/client/petstore/typescript-angular/API/Client/Pet.ts
@@ -26,7 +26,7 @@ namespace API.Client {
         export enum StatusEnum { 
             available = <any> 'available',
             pending = <any> 'pending',
-            sold = <any> 'sold',
+            sold = <any> 'sold'
         }
     }
 }
diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts
index 3ae51281c65..8982c807b45 100644
--- a/samples/client/petstore/typescript-node/api.ts
+++ b/samples/client/petstore/typescript-node/api.ts
@@ -43,7 +43,7 @@ export namespace Pet {
     export enum StatusEnum { 
         available = <any> 'available',
         pending = <any> 'pending',
-        sold = <any> 'sold',
+        sold = <any> 'sold'
     }
 }
 export class Tag {
@@ -67,7 +67,7 @@ export namespace Order {
     export enum StatusEnum { 
         placed = <any> 'placed',
         approved = <any> 'approved',
-        delivered = <any> 'delivered',
+        delivered = <any> 'delivered'
     }
 }