diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb
index e766f5c34..e42225a9f 100644
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -18,7 +18,7 @@
               <%= link_to debate.description, debate %>
               <div class="truncate"></div>
             </div>
-            <%= render "shared/tags", debate: debate, limit: 5 %>
+            <%= render "shared/tags", taggable: debate, limit: 5 %>
           </div>
         </div>
 
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 70f78ccf1..9d426bd5f 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -59,7 +59,7 @@
 
         <%= safe_html_with_links @debate.description %>
 
-        <%= render 'shared/tags', debate: @debate %>
+        <%= render 'shared/tags', taggable: @debate %>
 
         <div class='js-moderator-debate-actions'>
           <%= render 'actions', debate: @debate %>
diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb
index 21cb53f5b..840a938df 100644
--- a/app/views/proposals/_proposal.html.erb
+++ b/app/views/proposals/_proposal.html.erb
@@ -17,7 +17,7 @@
             <%= link_to proposal.summary, proposal %>
             <div class="truncate"></div>
           </div>
-          <%= render "shared/tags", proposal: proposal, limit: 5 %>
+          <%= render "shared/tags", taggable: proposal, limit: 5 %>
         </div>
       </div>
 
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index c85f3d2d9..152712b50 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -74,7 +74,7 @@
 
         <h4><%= @proposal.question %></h4>
 
-        <%= render 'shared/tags', proposal: @proposal %>
+        <%= render 'shared/tags', taggable: @proposal %>
 
         <div class='js-moderator-proposal-actions'>
           <%= render 'actions', proposal: @proposal %>
diff --git a/app/views/shared/_tags.html.erb b/app/views/shared/_tags.html.erb
index 6c6d87096..17f158d8a 100644
--- a/app/views/shared/_tags.html.erb
+++ b/app/views/shared/_tags.html.erb
@@ -1,5 +1,4 @@
 <%- limit ||= nil %>
-<%- taggable = defined?(debate) ? debate : proposal %>
 
 <% if taggable.tags.any? %>
   <span class='tags'>