diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 4efaed04cc..6a857a6de7 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -1093,19 +1093,6 @@ export default {
 			})
 		}
 
-		// Add attachments in case of forward
-		if (this.forwardFrom?.attachments !== undefined) {
-			this.forwardFrom.attachments.forEach((att) => {
-				this.attachments.push({
-					fileName: att.fileName,
-					displayName: trimStart('/', att.fileName),
-					id: att.id,
-					messageId: this.forwardFrom.databaseId,
-					type: 'message-attachment',
-				})
-			})
-		}
-
 		// Add messages forwarded as attachments
 		for (const id of this.forwardedMessages) {
 			const env = this.mainStore.getEnvelope(id)