diff --git a/app/serializers/rest/custom_emoji_serializer.rb b/app/serializers/rest/custom_emoji_serializer.rb
index a4d2556849..2d47068642 100644
--- a/app/serializers/rest/custom_emoji_serializer.rb
+++ b/app/serializers/rest/custom_emoji_serializer.rb
@@ -3,9 +3,11 @@
 class REST::CustomEmojiSerializer < ActiveModel::Serializer
   include RoutingHelper
 
-  attributes :shortcode, :url, :static_url, :visible_in_picker, :width, :height
+  attributes :shortcode, :url, :static_url, :visible_in_picker
 
   attribute :category, if: :category_loaded?
+  attribute :width, if: :width?
+  attribute :height, if: :height?
 
   def url
     full_asset_url(object.image.url)
@@ -23,11 +25,19 @@ class REST::CustomEmojiSerializer < ActiveModel::Serializer
     object.association(:category).loaded? && object.category.present?
   end
 
+  def width?
+    object.respond_to?(:image_width) || object.respond_to?(:width)
+  end
+
+  def height?
+    object.respond_to?(:image_height) || object.respond_to?(:height)
+  end
+
   def width
-    object.image_width
+    object.respond_to?(:image_width) ? object.image_width : object.width
   end
 
   def height
-    object.image_height
+    object.respond_to?(:image_height) ? object.image_height : object.height
   end
 end