diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index 08b3474cc..db716fd84 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -5,6 +5,6 @@ class Api::V1::CustomEmojisController < Api::BaseController
 
   def index
     expires_in 3.minutes, public: true
-    render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.listed.includes(:category) }
+    render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.enabled }
   end
 end
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index f14357932..ec8853597 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -48,7 +48,8 @@ class CustomEmoji < ApplicationRecord
   scope :remote, -> { where.not(domain: nil) }
   scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
-  scope :listed, -> { local.where(disabled: false).where(visible_in_picker: true) }
+  scope :enabled, -> { local.where(disabled: false) }
+  scope :listed, -> { enabled.where(visible_in_picker: true) }
 
   remotable_attachment :image, LIMIT