diff --git a/lib/active_admin/form_builder.rb b/lib/active_admin/form_builder.rb
index 911f4e04384..180e3be9ac1 100644
--- a/lib/active_admin/form_builder.rb
+++ b/lib/active_admin/form_builder.rb
@@ -62,7 +62,7 @@ def has_many(assoc, options = {}, &block)
           template.concat has_many_actions(has_many_form, builder_options, "".html_safe)
         end
 
-        template.assign(has_many_block: true)
+        template.assigns[:has_many_block] = true
         contents = without_wrapper { inputs(options, &form_block) } || "".html_safe
 
         if builder_options[:new_record]
diff --git a/lib/active_admin/views/components/active_admin_form.rb b/lib/active_admin/views/components/active_admin_form.rb
index 6441571085b..2d5202c9f31 100644
--- a/lib/active_admin/views/components/active_admin_form.rb
+++ b/lib/active_admin/views/components/active_admin_form.rb
@@ -43,7 +43,7 @@ def build(resource, options = {}, &block)
 
       def inputs(*args, &block)
         if block_given?
-          form_builder.template.assign(has_many_block: true)
+          form_builder.template.assigns[:has_many_block] = true
         end
         if block_given? && block.arity == 0
           wrapped_block = proc do