diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
index dd39449e1f..98e0a62fcd 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
@@ -95,7 +95,8 @@ module {{moduleName}}
       # For form parameters, remove empty value
       def outgoing_body
         # http form
-        if headers['Content-Type'] == 'application/x-www-form-urlencoded'
+        if headers['Content-Type'] == 'application/x-www-form-urlencoded' ||
+            headers['Content-Type'] == 'multipart/form-data'
           data = form_params.dup
           data.each do |key, value|
             data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter
diff --git a/samples/client/petstore/ruby/lib/petstore/swagger/request.rb b/samples/client/petstore/ruby/lib/petstore/swagger/request.rb
index ecb8cff564..8bb05af707 100644
--- a/samples/client/petstore/ruby/lib/petstore/swagger/request.rb
+++ b/samples/client/petstore/ruby/lib/petstore/swagger/request.rb
@@ -94,7 +94,8 @@ module Petstore
       # For form parameters, remove empty value
       def outgoing_body
         # http form
-        if headers['Content-Type'] == 'application/x-www-form-urlencoded'
+        if headers['Content-Type'] == 'application/x-www-form-urlencoded' ||
+            headers['Content-Type'] == 'multipart/form-data'
           data = form_params.dup
           data.each do |key, value|
             data[key] = value.to_s if value && !value.is_a?(File) # remove emtpy form parameter