diff --git a/app/controllers/api/v1/featured_tags_controller.rb b/app/controllers/api/v1/featured_tags_controller.rb
index 516046f009..a828428274 100644
--- a/app/controllers/api/v1/featured_tags_controller.rb
+++ b/app/controllers/api/v1/featured_tags_controller.rb
@@ -29,6 +29,6 @@ class Api::V1::FeaturedTagsController < Api::BaseController
   end
 
   def set_featured_tags
-    @featured_tags = current_account.featured_tags.order(statuses_count: :desc)
+    @featured_tags = current_account.featured_tags.by_status_count
   end
 end
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index 7e29dd1d29..b50fe56d64 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -36,7 +36,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def set_featured_tags
-    @featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
+    @featured_tags = current_account.featured_tags.by_status_count.reject(&:new_record?)
   end
 
   def set_recently_used_tags
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index 529056f9c6..345d2c3202 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -29,6 +29,7 @@ class FeaturedTag < ApplicationRecord
   before_create :reset_data
 
   scope :by_name, ->(name) { joins(:tag).where(tag: { name: HashtagNormalizer.new.normalize(name) }) }
+  scope :by_status_count, -> { order(statuses_count: :desc) }
 
   LIMIT = 10