diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 83c021341b8..300cf779cc3 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -702,6 +702,12 @@
   "attachmentSaved": {
     "message": "Attachment saved"
   },
+  "addAttachment": {
+    "message": "Add attachment"
+  },
+  "maxFileSizeSansPunctuation": {
+    "message": "Maximum file size is 500 MB"
+  },
   "file": {
     "message": "File"
   },
diff --git a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
index be6f10c01de..1552ef9f30e 100644
--- a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
+++ b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
@@ -29,7 +29,7 @@ export class DeleteAttachmentComponent {
   /** The attachment that is can be deleted */
   @Input({ required: true }) attachment!: AttachmentView;
 
-  /** Whether the attachemnt is being accessed from the admin console */
+  /** Whether the attachment is being accessed from the admin console */
   @Input() admin: boolean = false;
 
   /** Emits when the attachment is successfully deleted */
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.html b/libs/vault/src/components/download-attachment/download-attachment.component.html
index 47ee3c4761c..c2c2f1d4ebd 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.html
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.html
@@ -1,4 +1,5 @@
 <button
+  *ngIf="!isDecryptionFailure"
   [bitAction]="download"
   bitIconButton="bwi-download"
   buttonType="main"
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts b/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
index 8a4e962707d..8ba7b29a526 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
@@ -5,6 +5,7 @@ import { BehaviorSubject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { DECRYPT_ERROR } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
@@ -121,6 +122,13 @@ describe("DownloadAttachmentComponent", () => {
       Request = MockRequest as any;
     });
 
+    it("hides download button when the attachment has decryption failure", () => {
+      component.attachment.fileName = DECRYPT_ERROR;
+      fixture.detectChanges();
+
+      expect(fixture.debugElement.query(By.css("button"))).toBeNull();
+    });
+
     it("uses the attachment url when available when getAttachmentData returns a 404", async () => {
       getAttachmentData.mockRejectedValue(new ErrorResponse({}, 404));
 
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.ts b/libs/vault/src/components/download-attachment/download-attachment.component.ts
index e4c0c253f4f..627ffafc6b2 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.ts
@@ -6,6 +6,7 @@ import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { DECRYPT_ERROR } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -46,6 +47,10 @@ export class DownloadAttachmentComponent {
     private cipherService: CipherService,
   ) {}
 
+  protected get isDecryptionFailure(): boolean {
+    return this.attachment.fileName === DECRYPT_ERROR;
+  }
+
   /** Download the attachment */
   download = async () => {
     let url: string;