1 files changed, 13 insertions, 4 deletions
diff --git a/actionview/lib/action_view/helpers/tags/collection_check_boxes.rb b/actionview/lib/action_view/helpers/tags/collection_check_boxes.rb
index 8b28e4fc33..6242a2a085 100644
--- a/actionview/lib/action_view/helpers/tags/collection_check_boxes.rb
+++ b/actionview/lib/action_view/helpers/tags/collection_check_boxes.rb
@@ -28,10 +28,7 @@ module ActionView
           # Append a hidden field to make sure something will be sent back to the
           # server if all check boxes are unchecked.
           if @options.fetch(:include_hidden, true)
-            hidden_name = @html_options[:name] || "#{tag_name}[]"
-            hidden = @template_object.hidden_field_tag(hidden_name, "", :id => nil)
-
-            rendered_collection + hidden
+            rendered_collection + hidden_field
           else
             rendered_collection
           end
@@ -42,6 +39,18 @@ module ActionView
         def render_component(builder)
           builder.check_box + builder.label
         end
+
+        def hidden_field
+          hidden_name = @html_options[:name]
+
+          hidden_name ||= if @options.has_key?(:index)
+            "#{tag_name_with_index(@options[:index])}[]"
+          else
+            "#{tag_name}[]"
+          end
+
+          @template_object.hidden_field_tag(hidden_name, "", id: nil)
+        end
       end
     end
   end