diff --git a/app/components/polls/form_component.html.erb b/app/components/polls/form_component.html.erb
index bd1704133..6516b9152 100644
--- a/app/components/polls/form_component.html.erb
+++ b/app/components/polls/form_component.html.erb
@@ -1 +1,3 @@
-<%= render Polls::Questions::QuestionComponent.with_collection(questions) %>
+<% questions.each do |question| %>
+  <%= render Polls::Questions::QuestionComponent.new(question) %>
+<% end %>
diff --git a/app/components/polls/questions/question_component.rb b/app/components/polls/questions/question_component.rb
index ba52796b5..627abc6e9 100644
--- a/app/components/polls/questions/question_component.rb
+++ b/app/components/polls/questions/question_component.rb
@@ -1,7 +1,7 @@
 class Polls::Questions::QuestionComponent < ApplicationComponent
   attr_reader :question
 
-  def initialize(question:)
+  def initialize(question)
     @question = question
   end
 
diff --git a/spec/components/polls/questions/question_component_spec.rb b/spec/components/polls/questions/question_component_spec.rb
index 607906ad6..aba98dd94 100644
--- a/spec/components/polls/questions/question_component_spec.rb
+++ b/spec/components/polls/questions/question_component_spec.rb
@@ -7,7 +7,7 @@ describe Polls::Questions::QuestionComponent do
     option_b = create(:poll_question_option, question: question, title: "Answer B")
     allow_any_instance_of(Poll::Question::Option).to receive(:with_read_more?).and_return(true)
 
-    render_inline Polls::Questions::QuestionComponent.new(question: question)
+    render_inline Polls::Questions::QuestionComponent.new(question)
 
     poll_question = page.find("#poll_question_#{question.id}")
     expect(poll_question).to have_content("Read more about")