diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index b8514445307..e0d5d7e0aac 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -161,6 +161,13 @@ class TopicView
       return
     end
 
+
+    if opts[:only_moderator_liked]
+      liked_by_moderators = PostAction.where(post_id: @filtered_posts.pluck(:id), post_action_type_id: PostActionType.types[:like])
+      liked_by_moderators = liked_by_moderators.joins(:user).where('users.moderator').pluck(:post_id)
+      @filtered_posts = @filtered_posts.where(id: liked_by_moderators)
+    end
+
     @posts = @filtered_posts.order('percent_rank asc, sort_order asc').where("post_number > 1")
     @posts = @posts.includes(:reply_to_user).includes(:topic).joins(:user).limit(max)
 
@@ -184,12 +191,6 @@ class TopicView
       @posts = @posts.where('posts.score >= ?', min_score)
     end
 
-    if opts[:only_moderator_liked]
-      liked_by_moderators = PostAction.where(post_id: @filtered_posts.pluck(:id), post_action_type_id: PostActionType.types[:like])
-      liked_by_moderators = liked_by_moderators.joins(:user).where('users.moderator').pluck(:post_id)
-      @posts = @posts.where(id: liked_by_moderators)
-    end
-
     @posts = @posts.to_a
     @posts.sort!{|a,b| a.post_number <=> b.post_number}
     @posts