diff --git a/app/components/file_attachment_list/file_attachment.js b/app/components/file_attachment_list/file_attachment.js
index 1b2a87e2d..dc0578d86 100644
--- a/app/components/file_attachment_list/file_attachment.js
+++ b/app/components/file_attachment_list/file_attachment.js
@@ -64,7 +64,7 @@ export default class FileAttachment extends PureComponent {
         const style = getStyleSheet(theme);
 
         let fileAttachmentComponent;
-        if (file.has_preview_image || file.loading) {
+        if (file.has_preview_image || file.loading || file.mime_type === 'image/gif') {
             fileAttachmentComponent = (
                 <FileAttachmentImage
                     addFileToFetchCache={this.props.addFileToFetchCache}
diff --git a/app/screens/image_preview/image_preview.js b/app/screens/image_preview/image_preview.js
index b4d2352e7..dc014d4e0 100644
--- a/app/screens/image_preview/image_preview.js
+++ b/app/screens/image_preview/image_preview.js
@@ -327,7 +327,7 @@ export default class ImagePreview extends PureComponent {
                     >
                         {this.props.files.map((file, index) => {
                             let component;
-                            if (file.has_preview_image) {
+                            if (file.has_preview_image || file.mime_type === 'image/gif') {
                                 component = (
                                     <Previewer
                                         ref={(c) => {
diff --git a/app/screens/image_preview/previewer.js b/app/screens/image_preview/previewer.js
index 2a1d937b6..024d99c04 100644
--- a/app/screens/image_preview/previewer.js
+++ b/app/screens/image_preview/previewer.js
@@ -195,6 +195,10 @@ export default class Previewer extends Component {
     handleGetImageURL = () => {
         const {file} = this.props;
 
+        if (file.mime_type === 'image/gif') {
+            return Client4.getFileUrl(file.id, this.state.timestamp);
+        }
+
         return Client4.getFilePreviewUrl(file.id, this.state.timestamp);
     };