diff --git a/modules/swagger-codegen/src/main/resources/Javascript/api.mustache b/modules/swagger-codegen/src/main/resources/Javascript/api.mustache
index 0236f6a61be..9957fc4e2c5 100644
--- a/modules/swagger-codegen/src/main/resources/Javascript/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Javascript/api.mustache
@@ -42,7 +42,7 @@ var {{classname}} = function {{classname}}() {
     }
     
     var {{localVariablePrefix}}path = basePath + replaceAll(replaceAll("{{{path}}}", "\\{format\\}","json"){{#pathParams}}
-, "\\{" + "{{baseName}}" + "\\}", encodeURIComponent({{localVariablePrefix}}{{{paramName}}}.toString()){{/pathParams}});
+, "\\{" + "{{baseName}}" + "\\}", encodeURIComponent({{{paramName}}}.toString()){{/pathParams}});
 
     var queryParams = {};
     var headerParams =  {};
@@ -52,7 +52,7 @@ var {{classname}} = function {{classname}}() {
     queryParams.{{baseName}} = {{paramName}};
     {{/queryParams}}
     {{#headerParams}}if ({{paramName}} != null)
-    {{localVariablePrefix}}headerParams.put("{{baseName}}", {{localVariablePrefix}}apiClient.parameterToString({{paramName}}));
+    {{localVariablePrefix}}headerParams.put("{{baseName}}", {{paramName}});
     {{/headerParams}}
     {{#formParams}}if ({{paramName}} != null)
       {{localVariablePrefix}}formParams.put("{{baseName}}", {{paramName}});
diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js
index 3d5eb1dc9e5..3b6d9c5b4c6 100644
--- a/samples/client/petstore/javascript/src/api/PetApi.js
+++ b/samples/client/petstore/javascript/src/api/PetApi.js
@@ -401,7 +401,7 @@ var PetApi = function PetApi() {
 
     
     if (apiKey != null)
-    headerParams.put("api_key", apiClient.parameterToString(apiKey));
+    headerParams.put("api_key", apiKey);