diff --git a/app/components/file_attachment_list/file_attachment_image.js b/app/components/file_attachment_list/file_attachment_image.js
index 2597b2578..1a5d2625d 100644
--- a/app/components/file_attachment_list/file_attachment_image.js
+++ b/app/components/file_attachment_list/file_attachment_image.js
@@ -56,7 +56,7 @@ export default class FileAttachmentImage extends PureComponent {
         super(props);
 
         const {file} = props;
-        if (file && file.id) {
+        if (file && file.id && !file.localPath) {
             const headers = {
                 Authorization: `Bearer ${Client4.getToken()}`,
                 'X-CSRF-Token': Client4.csrf,
@@ -68,6 +68,10 @@ export default class FileAttachmentImage extends PureComponent {
                 {uri: Client4.getFileUrl(file.id), headers},
             ];
 
+            if (isGif(file)) {
+                preloadImages.push({uri: Client4.getFilePreviewUrl(file.id), headers});
+            }
+
             FastImage.preload(preloadImages);
         }
 
@@ -99,7 +103,7 @@ export default class FileAttachmentImage extends PureComponent {
             imageProps.defaultSource = {uri: file.localPath};
         } else if (file.id) {
             imageProps.thumbnailUri = Client4.getFileThumbnailUrl(file.id);
-            imageProps.imageUri = Client4.getFileUrl(file.id);
+            imageProps.imageUri = isGif(file) ? Client4.getFilePreviewUrl(file.id) : Client4.getFileUrl(file.id);
         }
         return imageProps;
     };
diff --git a/app/init/credentials.js b/app/init/credentials.js
index b0bf83002..309fbf3fc 100644
--- a/app/init/credentials.js
+++ b/app/init/credentials.js
@@ -54,7 +54,7 @@ export const getAppCredentials = async () => {
 export const removeAppCredentials = async () => {
     const url = await getCurrentServerUrl();
 
-    Client4.setCSRF(null);
+    Client4.setCSRF('');
     Client4.serverVersion = '';
     Client4.setUserId('');
     Client4.setToken('');