diff --git a/app/views/budgets/investments/show.html.erb b/app/views/budgets/investments/show.html.erb
index de38661a5..b0eee0ec3 100644
--- a/app/views/budgets/investments/show.html.erb
+++ b/app/views/budgets/investments/show.html.erb
@@ -19,7 +19,6 @@
 <div class="tabs-content" data-tabs-content="investments_tabs">
   <div class="tabs-panel is-active" id="tab-comments">
     <%= render "/comments/comment_tree", comment_tree: @comment_tree,
-                                         comment_flags: @comment_flags,
                                          display_comments_count: false %>
   </div>
 
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 0f51daac0..2448dc211 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -1,10 +1,9 @@
-<% comment_flags ||= @comment_flags %>
 <% valuation = local_assigns.fetch(:valuation, false) %>
 <% allow_votes = local_assigns.fetch(:allow_votes, true) %>
 <% allow_actions = local_assigns.fetch(:allow_actions, true) %>
 <% allow_comments = local_assigns.fetch(:allow_comments, true) %>
 <% admin_layout = local_assigns.fetch(:admin_layout, false) %>
-<% cache [locale_and_user_status(comment), comment, commentable_cache_key(comment.commentable), comment.author, (comment_flags[comment.id] if comment_flags), (admin_layout if admin_layout)] do %>
+<% cache [locale_and_user_status(comment), comment, commentable_cache_key(comment.commentable), comment.author, (admin_layout if admin_layout)] do %>
   <ul id="<%= dom_id(comment) %>" class="comment no-bullet small-12">
     <li class="comment-body">
       <% if comment.hidden? || comment.user.hidden? %>
diff --git a/app/views/comments/_comment_tree.html.erb b/app/views/comments/_comment_tree.html.erb
index 78acd65c4..03d23c141 100644
--- a/app/views/comments/_comment_tree.html.erb
+++ b/app/views/comments/_comment_tree.html.erb
@@ -2,7 +2,7 @@
 <% valuation = local_assigns.fetch(:valuation, false) %>
 <% allow_comments = local_assigns.fetch(:allow_comments, true) %>
 <% admin_layout = local_assigns.fetch(:admin_layout, false) %>
-<% cache [locale_and_user_status, comment_tree.order, commentable_cache_key(commentable), comment_tree.comments, comment_tree.comment_authors, commentable.comments_count, comment_flags, admin_layout] do %>
+<% cache [locale_and_user_status, comment_tree.order, commentable_cache_key(commentable), comment_tree.comments, comment_tree.comment_authors, commentable.comments_count, admin_layout] do %>
   <section class="expanded comments">
     <div class="row">
       <div id="comments" class="small-12 column">
@@ -39,7 +39,6 @@
 
         <% comment_tree.root_comments.each do |comment| %>
           <%= render "comments/comment", { comment: comment,
-                                           comment_flags: comment_flags,
                                            valuation: valuation,
                                            allow_votes: !valuation,
                                            allow_actions: !valuation,
diff --git a/app/views/debates/_comments.html.erb b/app/views/debates/_comments.html.erb
index aec0a1414..cf7f553d0 100644
--- a/app/views/debates/_comments.html.erb
+++ b/app/views/debates/_comments.html.erb
@@ -1,4 +1,4 @@
-<% cache [locale_and_user_status, @current_order, commentable_cache_key(@debate), @comment_tree.comments, @comment_tree.comment_authors, @debate.comments_count, @comment_flags] do %>
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@debate), @comment_tree.comments, @comment_tree.comment_authors, @debate.comments_count] do %>
   <div class="row comments">
     <div id="comments" class="small-12 column">
       <h3>
diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb
index f8aeeb655..d5297bc50 100644
--- a/app/views/legislation/annotations/show.html.erb
+++ b/app/views/legislation/annotations/show.html.erb
@@ -43,7 +43,6 @@
         </div>
 
       <%= render "/comments/comment_tree", comment_tree: @comment_tree,
-                                           comment_flags: @comment_flags,
                                            display_comments_count: true %>
       </div>
     </div>
diff --git a/app/views/legislation/proposals/_comments.html.erb b/app/views/legislation/proposals/_comments.html.erb
index a3b0c635e..61efe69e2 100644
--- a/app/views/legislation/proposals/_comments.html.erb
+++ b/app/views/legislation/proposals/_comments.html.erb
@@ -1,4 +1,4 @@
-<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %>
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count] do %>
   <div class="row comments">
     <div id="comments" class="small-12 column">
       <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
diff --git a/app/views/legislation/questions/show.html.erb b/app/views/legislation/questions/show.html.erb
index e8bd1a4f0..dec291438 100644
--- a/app/views/legislation/questions/show.html.erb
+++ b/app/views/legislation/questions/show.html.erb
@@ -43,6 +43,5 @@
   </div>
 
   <%= render "/comments/comment_tree", comment_tree: @comment_tree,
-                                       comment_flags: @comment_flags,
                                        display_comments_count: true %>
 </section>
diff --git a/app/views/polls/_comments.html.erb b/app/views/polls/_comments.html.erb
index 5ac2dfb64..edab112a7 100644
--- a/app/views/polls/_comments.html.erb
+++ b/app/views/polls/_comments.html.erb
@@ -1,4 +1,4 @@
-<% cache [locale_and_user_status, @current_order, commentable_cache_key(@poll), @comment_tree.comments, @comment_tree.comment_authors, @poll.comments_count, @comment_flags] do %>
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@poll), @comment_tree.comments, @comment_tree.comment_authors, @poll.comments_count] do %>
   <div class="row comments">
     <div id="comments" class="small-12 column">
       <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
diff --git a/app/views/proposals/_comments.html.erb b/app/views/proposals/_comments.html.erb
index a3b0c635e..61efe69e2 100644
--- a/app/views/proposals/_comments.html.erb
+++ b/app/views/proposals/_comments.html.erb
@@ -1,4 +1,4 @@
-<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %>
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count] do %>
   <div class="row comments">
     <div id="comments" class="small-12 column">
       <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
diff --git a/app/views/topics/_comments.html.erb b/app/views/topics/_comments.html.erb
index a5ca165fe..e6e73e79e 100644
--- a/app/views/topics/_comments.html.erb
+++ b/app/views/topics/_comments.html.erb
@@ -1,4 +1,4 @@
-<% cache [locale_and_user_status, @current_order, commentable_cache_key(@topic), @comment_tree.comments, @comment_tree.comment_authors, @topic.comments_count, @comment_flags] do %>
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@topic), @comment_tree.comments, @comment_tree.comment_authors, @topic.comments_count] do %>
   <div class="row comments">
 
     <div id="comments" class="small-12 column">
diff --git a/app/views/valuation/budget_investments/_valuation_comments.html.erb b/app/views/valuation/budget_investments/_valuation_comments.html.erb
index f6b4c9a53..b852f93e9 100644
--- a/app/views/valuation/budget_investments/_valuation_comments.html.erb
+++ b/app/views/valuation/budget_investments/_valuation_comments.html.erb
@@ -1,7 +1,6 @@
 <h2><%= t("valuation.budget_investments.valuation_comments") %></h2>
 <% unless @comment_tree.nil? %>
   <%= render "/comments/comment_tree", comment_tree: @comment_tree,
-    comment_flags: @comment_flags,
     display_comments_count: false,
     valuation: true,
     allow_comments: can?(:comment_valuation, @investment),