diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index e098719b0a0..54cac0c4b2b 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -92,7 +92,7 @@ class Emoji
   def self.load_custom
     result = []
 
-    CustomEmoji.all.each do |emoji|
+    CustomEmoji.order(:name).all.each do |emoji|
       result << Emoji.new.tap do |e|
         e.name = emoji.name
         e.url = emoji.upload.url