diff --git a/app/actions/views/file_upload.js b/app/actions/views/file_upload.js
index aada24b93..e1784078d 100644
--- a/app/actions/views/file_upload.js
+++ b/app/actions/views/file_upload.js
@@ -19,7 +19,12 @@ export function handleUploadFiles(files, rootId) {
         const re = /heic/i;
 
         files.forEach((file) => {
-            let name = file.fileName;
+            let name = file.fileName || file.path || file.uri;
+
+            if (name.includes('/')) {
+                name = name.split('/').pop();
+            }
+
             let mimeType = lookupMimeType(name);
             let extension = name.split('.').pop().replace('.', '');
             const uri = file.uri;
diff --git a/app/components/file_upload_preview/file_upload_preview.js b/app/components/file_upload_preview/file_upload_preview.js
index ef5fd1b00..3a4ab9f01 100644
--- a/app/components/file_upload_preview/file_upload_preview.js
+++ b/app/components/file_upload_preview/file_upload_preview.js
@@ -45,7 +45,7 @@ export default class FileUploadPreview extends PureComponent {
     buildFilePreviews = () => {
         return this.props.files.map((file) => {
             let filePreviewComponent;
-            if (file.loading | file.has_preview_image) {
+            if (file.loading | (file.has_preview_image || file.mime_type === 'image/gif')) {
                 filePreviewComponent = (
                     <FileAttachmentImage
                         addFileToFetchCache={this.props.actions.addFileToFetchCache}