diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb
index 6f6fc13d1608edef0c7c9e4eda19803c47d6f300..a54c1034765fc5845678d0aedc1843ce808510c2 100644
--- a/activerecord/lib/active_record/attribute_assignment.rb
+++ b/activerecord/lib/active_record/attribute_assignment.rb
@@ -106,7 +106,7 @@ def assign_attributes(new_attributes, options = {})
 
       # assign any deferred nested attributes after the base attributes have been set
       nested_parameter_attributes.each { |k,v| _assign_attribute(k, v) }
-      assign_multiparameter_attributes(multi_parameter_attributes)
+      assign_multiparameter_attributes(multi_parameter_attributes) unless multi_parameter_attributes.empty?
     ensure
       @mass_assignment_options = previous_options
     end