diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index c715e4569d..96581c4cbd 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -307,7 +307,7 @@ class MediaAttachment < ApplicationRecord
     private
 
     def file_styles(attachment)
-      if VIDEO_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
+      if attachment.instance.file_content_type == 'image/gif' || VIDEO_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
         VIDEO_CONVERTED_STYLES
       elsif IMAGE_CONVERTIBLE_MIME_TYPES.include?(attachment.instance.file_content_type)
         IMAGE_CONVERTED_STYLES
@@ -321,7 +321,9 @@ class MediaAttachment < ApplicationRecord
     end
 
     def file_processors(instance)
-      if VIDEO_MIME_TYPES.include?(instance.file_content_type)
+      if instance.file_content_type == 'image/gif'
+        [:gif_transcoder, :blurhash_transcoder]
+      elsif VIDEO_MIME_TYPES.include?(instance.file_content_type)
         [:transcoder, :blurhash_transcoder, :type_corrector]
       elsif AUDIO_MIME_TYPES.include?(instance.file_content_type)
         [:image_extractor, :transcoder, :type_corrector]