diff --git a/app/views/shared/_geozone.html.erb b/app/components/shared/geozone_link_component.html.erb
similarity index 100%
rename from app/views/shared/_geozone.html.erb
rename to app/components/shared/geozone_link_component.html.erb
diff --git a/app/components/shared/geozone_link_component.rb b/app/components/shared/geozone_link_component.rb
new file mode 100644
index 000000000..00c96f558
--- /dev/null
+++ b/app/components/shared/geozone_link_component.rb
@@ -0,0 +1,8 @@
+class Shared::GeozoneLinkComponent < ApplicationComponent
+  attr_reader :geozonable
+  delegate :geozone_name, to: :helpers
+
+  def initialize(geozonable)
+    @geozonable = geozonable
+  end
+end
diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb
index 9be3ee3b3..58038f5a9 100644
--- a/app/views/legislation/proposals/show.html.erb
+++ b/app/views/legislation/proposals/show.html.erb
@@ -94,7 +94,7 @@
 
         <%= render "shared/tags", taggable: @proposal %>
 
-        <%= render "shared/geozone", geozonable: @proposal %>
+        <%= render Shared::GeozoneLinkComponent.new(@proposal) %>
 
         <div class="js-moderator-proposal-actions margin">
           <%= render "legislation/proposals/actions", proposal: @proposal %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 02dc1c38c..ab65df0c7 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -40,7 +40,7 @@
         <% end %>
 
         <%= render "proposals/info", proposal: @proposal %>
-        <%= render "shared/geozone", geozonable: @proposal %>
+        <%= render Shared::GeozoneLinkComponent.new(@proposal) %>
 
         <% unless @proposal.selected? %>
           <%= render "relationable/related_content", relationable: @proposal %>