diff --git a/app/views/polls/_poll_header.html.erb b/app/components/polls/poll_header_component.html.erb
similarity index 50%
rename from app/views/polls/_poll_header.html.erb
rename to app/components/polls/poll_header_component.html.erb
index 73cd608db..c4b2e6cad 100644
--- a/app/views/polls/_poll_header.html.erb
+++ b/app/components/polls/poll_header_component.html.erb
@@ -1,33 +1,33 @@
 <div class="expanded no-margin-top polls-show-header">
   <div class="row">
     <div class="small-12 medium-9 column padding">
-      <% if @poll.related.nil? %>
+      <% if poll.related.nil? %>
         <%= back_link_to polls_path, t("polls.show.back") %>
       <% else %>
-        <%= link_to t("polls.poll_header.back_to_proposal"), [@poll.related] %>
+        <%= link_to t("polls.poll_header.back_to_proposal"), [poll.related] %>
       <% end %>
 
-      <h1><%= @poll.name %></h1>
+      <h1><%= poll.name %></h1>
 
-      <%= auto_link_already_sanitized_html simple_format(@poll.summary) %>
+      <%= auto_link_already_sanitized_html simple_format(poll.summary) %>
 
-      <% if @poll.geozones.any? %>
+      <% if poll.geozones.any? %>
         <ul class="margin-top tags">
-          <% @poll.geozones.each do |g| %>
+          <% poll.geozones.each do |g| %>
             <li><span><%= g.name %></span></li>
           <% end %>
         </ul>
       <% end %>
-      <%= render SDG::TagListComponent.new(@poll, linkable: false) %>
+      <%= render SDG::TagListComponent.new(poll, linkable: false) %>
     </div>
 
     <aside class="small-12 medium-3 column margin-top">
       <%= render "shared/social_share",
                  share_title: t("shared.share"),
-                 title: @poll.name,
-                 url: poll_url(@poll),
-                 description: @poll.name,
-                 mobile: @poll.name %>
+                 title: poll.name,
+                 url: poll_url(poll),
+                 description: poll.name,
+                 mobile: poll.name %>
     </aside>
   </div>
 </div>
diff --git a/app/components/polls/poll_header_component.rb b/app/components/polls/poll_header_component.rb
new file mode 100644
index 000000000..a4da1befe
--- /dev/null
+++ b/app/components/polls/poll_header_component.rb
@@ -0,0 +1,8 @@
+class Polls::PollHeaderComponent < ApplicationComponent
+  attr_reader :poll
+  use_helpers :auto_link_already_sanitized_html
+
+  def initialize(poll)
+    @poll = poll
+  end
+end
diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb
index 940be9e8a..8f6cddd44 100644
--- a/app/views/polls/results.html.erb
+++ b/app/views/polls/results.html.erb
@@ -1,7 +1,7 @@
 <% provide :title, @poll.name %>
 
 <div class="polls-results-stats">
-  <%= render "poll_header" %>
+  <%= render Polls::PollHeaderComponent.new(@poll) %>
 
   <%= render "poll_subnav" %>
 
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
index 3d9d88494..0ccbeaad1 100644
--- a/app/views/polls/show.html.erb
+++ b/app/views/polls/show.html.erb
@@ -10,7 +10,7 @@
 <% end %>
 
 <div class="polls-show">
-  <%= render "poll_header" %>
+  <%= render Polls::PollHeaderComponent.new(@poll) %>
 
   <%= render "poll_subnav" %>
 
diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb
index dcc45836d..b99052f48 100644
--- a/app/views/polls/stats.html.erb
+++ b/app/views/polls/stats.html.erb
@@ -1,7 +1,7 @@
 <% provide :title, @poll.name %>
 
 <div class="participation-stats polls-results-stats">
-  <%= render "poll_header" %>
+  <%= render Polls::PollHeaderComponent.new(@poll) %>
 
   <%= render "poll_subnav" %>