diff --git a/app/containers/message/Image.tsx b/app/containers/message/Image.tsx
index ad8a32a17..937b2926b 100644
--- a/app/containers/message/Image.tsx
+++ b/app/containers/message/Image.tsx
@@ -113,7 +113,9 @@ const ImageContainer = React.memo(
 			const isAutoDownloadEnabled = fetchAutoDownloadEnabled('imagesPreferenceDownload');
 			if (isAutoDownloadEnabled || isCurrentUserAuthor) {
 				await handleDownload();
+				return;
 			}
+			setLoading(false);
 		};
 
 		const handleDownload = async () => {
diff --git a/app/containers/message/Video.tsx b/app/containers/message/Video.tsx
index 9a45315fa..0a6e52224 100644
--- a/app/containers/message/Video.tsx
+++ b/app/containers/message/Video.tsx
@@ -147,7 +147,9 @@ const Video = React.memo(
 			const isAutoDownloadEnabled = fetchAutoDownloadEnabled('videoPreferenceDownload');
 			if (isAutoDownloadEnabled) {
 				await handleDownload();
+				return;
 			}
+			setLoading(false);
 		};
 
 		const handleDownload = async () => {