diff --git a/app/models/comment.rb b/app/models/comment.rb
index 52192cc7f..237eb329e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -75,6 +75,10 @@ class Comment < ActiveRecord::Base
     commentable_type.constantize.reset_counters(commentable_id, :comments)
   end
 
+  def after_restore
+    commentable_type.constantize.reset_counters(commentable_id, :comments)
+  end
+
   def reply?
     !root?
   end
diff --git a/lib/tasks/comments.rake b/lib/tasks/comments.rake
new file mode 100644
index 000000000..6c3f32687
--- /dev/null
+++ b/lib/tasks/comments.rake
@@ -0,0 +1,9 @@
+namespace :comments do
+
+  desc "Recalculates all the comment counters for debates and proposals"
+  task count: :environment do
+    Debate.all.pluck(:id).each{ |id| Debate.reset_counters(id, :comments) }
+    Proposal.all.pluck(:id).each{ |id| Proposal.reset_counters(id, :comments) }
+  end
+
+end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 0349992cf..fdb632986 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -4,21 +4,23 @@ describe Comment do
 
   let(:comment) { build(:comment) }
 
-  it "should be valid" do
+  it "is valid" do
     expect(comment).to be_valid
   end
 
-  it "should update cache_counter in debate after hide" do
+  it "updates cache_counter in debate after hide and restore" do
     debate  = create(:debate)
     comment = create(:comment, commentable: debate)
 
     expect(debate.reload.comments_count).to eq(1)
     comment.hide
     expect(debate.reload.comments_count).to eq(0)
+    comment.restore
+    expect(debate.reload.comments_count).to eq(1)
   end
 
   describe "#as_administrator?" do
-    it "should be true if comment has administrator_id, false otherway" do
+    it "is true if comment has administrator_id, false otherway" do
       expect(comment).not_to be_as_administrator
 
       comment.administrator_id = 33
@@ -28,7 +30,7 @@ describe Comment do
   end
 
   describe "#as_moderator?" do
-    it "should be true if comment has moderator_id, false otherway" do
+    it "is true if comment has moderator_id, false otherway" do
       expect(comment).not_to be_as_moderator
 
       comment.moderator_id = 21
@@ -40,27 +42,27 @@ describe Comment do
   describe "cache" do
     let(:comment) { create(:comment) }
 
-    it "should expire cache when it has a new vote" do
+    it "expires cache when it has a new vote" do
       expect { create(:vote, votable: comment) }
       .to change { comment.updated_at }
     end
 
-    it "should expire cache when hidden" do
+    it "expires cache when hidden" do
       expect { comment.hide }
       .to change { comment.updated_at }
     end
 
-    it "should expire cache when the author is hidden" do
+    it "expires cache when the author is hidden" do
       expect { comment.user.hide }
       .to change { [comment.reload.updated_at, comment.author.updated_at] }
     end
 
-    it "should expire cache when the author changes" do
+    it "expires cache when the author changes" do
       expect { comment.user.update(username: "Isabel") }
       .to change { [comment.reload.updated_at, comment.author.updated_at] }
     end
 
-    it "should expire cache when the author's organization get verified" do
+    it "expires cache when the author's organization get verified" do
       create(:organization, user: comment.user)
       expect { comment.user.organization.verify }
       .to change { [comment.reload.updated_at, comment.author.updated_at] }