diff --git a/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java
index 8c3b4af1fb..8425cb606c 100644
--- a/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java
+++ b/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java
@@ -92,7 +92,9 @@ public JavaScriptClientCodegen() {
         modelTestTemplateFiles.put("model_test.mustache", ".js");
         apiTemplateFiles.put("api.mustache", ".js");
         apiTestTemplateFiles.put("api_test.mustache", ".js");
-        embeddedTemplateDir = templateDir = "javascript";
+        if (StringUtils.isBlank(templateDir)) {
+            embeddedTemplateDir = templateDir = getTemplateDir();
+        }
         apiPackage = "api";
         modelPackage = "model";
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
@@ -765,7 +767,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
     @Override
     public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> allSchemas) {
         CodegenModel codegenModel = super.fromModel(name, schema, allSchemas);
-        
+
         boolean hasEnums = getBooleanValue(codegenModel, HAS_ENUMS_EXT_NAME);
         if (allSchemas != null && codegenModel != null && codegenModel.parent != null && hasEnums) {
             final Schema parentModel = allSchemas.get(codegenModel.parentSchema);
@@ -789,7 +791,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
                     codegenModel.vendorExtensions.put("x-isPrimitive", true);
                 }
             }
-        } 
+        }
         return codegenModel;
     }
 
@@ -816,7 +818,7 @@ private String getModelledType(String dataType) {
 
     @Override
     public String getDefaultTemplateDir() {
-        return "JavaScript";
+        return "javascript";
     }
 
     private String getJSDocType(CodegenModel cm, CodegenProperty cp) {
diff --git a/src/main/resources/handlebars/javascript/.babelrc.mustache b/src/main/resources/handlebars/javascript/.babelrc.mustache
new file mode 100644
index 0000000000..0bb6a0ec5d
--- /dev/null
+++ b/src/main/resources/handlebars/javascript/.babelrc.mustache
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["babel-plugin-transform-builtin-extend", {
+      globals: ["Error", "Array"]
+    }]
+  ],
+  "presets": ["env", "stage-0"]
+}