diff --git a/Tusker/Views/Attachments/AttachmentView.swift b/Tusker/Views/Attachments/AttachmentView.swift
index 7d6b46a911..61fa044037 100644
--- a/Tusker/Views/Attachments/AttachmentView.swift
+++ b/Tusker/Views/Attachments/AttachmentView.swift
@@ -165,7 +165,9 @@ class AttachmentView: UIImageView, GIFAnimatable {
             if self.attachment.url.pathExtension == "gif" {
                 self.source = .gifData(attachmentURL, data)
                 if self.autoplayGifs {
-                    self.animate(withGIFData: data)
+                    DispatchQueue.main.async {
+                        self.animate(withGIFData: data)
+                    }
                 } else {
                     self.displayImage()
                 }