diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index f8e7b968a..990f6489b 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -5,7 +5,7 @@ class DebatesController < ApplicationController
   respond_to :html, :js
 
   def index
-    @debates = Debate.includes(:tags).includes(:inappropiate_flags).search(params).page(params[:page])
+    @debates = Debate.search(params).page(params[:page]).for_render
     set_debate_votes(@debates)
   end
 
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 7b43bc71c..15590fc60 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -27,6 +27,7 @@ class Debate < ActiveRecord::Base
   scope :pending, -> { where(archived_at: nil, hidden_at: nil) }
   scope :archived, -> { where("archived_at IS NOT NULL AND hidden_at IS NULL") }
   scope :flagged_as_inappropiate, -> { where("inappropiate_flags_count > 0") }
+  scope :for_render, -> { includes(:tags) }
 
   # Ahoy setup
   visitable # Ahoy will automatically assign visit_id on create