diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index c6f57bd4a37..b11a3a8c1b5 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -38,16 +38,16 @@ namespace {{packageName}}.Client {
     private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
 
     public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
+      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, Dictionary<String, String> PathParams, String[] AuthSettings) {
       var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
+                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, PathParams, AuthSettings);
                             return resp;
                             });
         return response.Result;
     }
 
     public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
+      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, Dictionary<String, String> PathParams, String[] AuthSettings) {
 
       var request = new RestRequest(Path, Method);
 
@@ -57,6 +57,10 @@ namespace {{packageName}}.Client {
       foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
         request.AddHeader(defaultHeader.Key, defaultHeader.Value);
 
+      // add path parameter, if any
+      foreach(KeyValuePair<string, string> param in PathParams)
+        request.AddParameter(param.Key, param.Value, ParameterType.UrlSegment);
+
       // add header parameter, if any
       foreach(KeyValuePair<string, string> param in HeaderParams)
         request.AddHeader(param.Key, param.Value);
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index 652d15a30b3..70bc634ca3a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -92,16 +92,18 @@ namespace {{packageName}}.Api {
       {{/required}}{{/allParams}}
 
       var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
 
+      var pathParams = new Dictionary<String, String>();
       var queryParams = new Dictionary<String, String>();
       var headerParams = new Dictionary<String, String>();
       var formParams = new Dictionary<String, String>();
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
+      pathParams.Add("format", "json");
+      {{#pathParams}} if ({{paramName}} != null) pathParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // path parameter
+      {{/pathParams}}
+
       {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
       {{/queryParams}}
       {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
@@ -115,7 +117,7 @@ namespace {{packageName}}.Api {
       String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
       // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
 
       if (((int)response.StatusCode) >= 400) {
         throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
@@ -137,16 +139,18 @@ namespace {{packageName}}.Api {
       {{/required}}{{/allParams}}
 
       var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
 
+      var pathParams = new Dictionary<String, String>();
       var queryParams = new Dictionary<String, String>();
       var headerParams = new Dictionary<String, String>();
       var formParams = new Dictionary<String, String>();
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
+      pathParams.Add("format", "json");
+      {{#pathParams}} if ({{paramName}} != null) pathParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // path parameter
+      {{/pathParams}}
+
       {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
       {{/queryParams}}
       {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
@@ -160,7 +164,7 @@ namespace {{packageName}}.Api {
       String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
       // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, pathParams, authSettings);
       if (((int)response.StatusCode) >= 400) {
         throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
       }