diff --git a/.changeset/hungry-wombats-act.md b/.changeset/hungry-wombats-act.md
new file mode 100644
index 00000000000..4e50b172e17
--- /dev/null
+++ b/.changeset/hungry-wombats-act.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where non-encrypted attachments were not being downloaded
diff --git a/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx b/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx
index b7bcd7d1e9d..86223cd7f2b 100644
--- a/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/file/GenericFileAttachment.tsx
@@ -38,15 +38,21 @@ const GenericFileAttachment = ({
 	const { t } = useTranslation();
 
 	const handleTitleClick = (event: UIEvent): void => {
-		if (openDocumentViewer && link) {
+		if (!link) {
+			return;
+		}
+
+		if (openDocumentViewer && format === 'PDF') {
 			event.preventDefault();
 
-			if (format === 'PDF') {
-				const url = new URL(getURL(link), window.location.origin);
-				url.searchParams.set('contentDisposition', 'inline');
-				openDocumentViewer(url.toString(), format, '');
-				return;
-			}
+			const url = new URL(getURL(link), window.location.origin);
+			url.searchParams.set('contentDisposition', 'inline');
+			openDocumentViewer(url.toString(), format, '');
+			return;
+		}
+
+		if (link.includes('/file-decrypt/')) {
+			event.preventDefault();
 
 			registerDownloadForUid(uid, t, title);
 			forAttachmentDownload(uid, link);