diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index db865e2b27d..1b49d9b5347 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -233,12 +233,15 @@ namespace {{packageName}}.Client
                         ? Path.GetTempPath()
                         : Configuration.TempFolderPath;
                     var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
-                    var match = regex.Match(headers.ToString());
-                    if (match.Success)
+                    foreach (var header in headers)
                     {
-                        string fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
-                        File.WriteAllBytes(fileName, data);
-                        return new FileStream(fileName, FileMode.Open);
+                        var match = regex.Match(header.ToString());
+                        if (match.Success)
+                        {
+                            string fileName = filePath + match.Groups[1].Value.Replace("\"", "").Replace("'", "");
+                            File.WriteAllBytes(fileName, data);
+                            return new FileStream(fileName, FileMode.Open);
+                        }
                     }
                 }
                 var stream = new MemoryStream(data);