diff --git a/app/lib/encryption/room.ts b/app/lib/encryption/room.ts
index ff7dc5f5b35..685ddb214eb 100644
--- a/app/lib/encryption/room.ts
+++ b/app/lib/encryption/room.ts
@@ -19,7 +19,6 @@ import getSingleMessage from '../methods/getSingleMessage';
 import type {
 	IAttachment,
 	IMessage,
-	IUpload,
 	TSendFileMessageFileInfo,
 	IServerAttachment,
 	TSubscriptionModel,
@@ -482,46 +481,20 @@ export default class EncryptionRoom {
 		try {
 			const content = await this.encryptText(EJSON.stringify({ msg: message.msg || '' }));
 
-			return {
+			const encryptedMessage = {
 				...message,
 				t: E2E_MESSAGE_TYPE,
 				e2e: E2E_STATUS.PENDING,
 				e2eMentions: getE2EEMentions(message.msg),
 				content
-			};
-		} catch (e) {
-			// Do nothing
-			console.error(e);
-		}
+			} as IMessage;
 
-		return message;
-	};
-
-	// Encrypt upload
-	encryptUpload = async (message: IUpload) => {
-		if (!this.ready) {
-			return message;
-		}
+			delete encryptedMessage.msg;
 
-		try {
-			let description = '';
-
-			if (message.description) {
-				const encryptedResult = await this.encryptText(EJSON.stringify({ msg: message.description }));
-				description =
-					encryptedResult.algorithm === 'rc.v1.aes-sha2'
-						? encryptedResult.ciphertext
-						: EJSON.stringify({ kid: encryptedResult.kid, iv: encryptedResult.iv, ciphertext: encryptedResult.ciphertext });
-			}
-
-			return {
-				...message,
-				t: E2E_MESSAGE_TYPE,
-				e2e: E2E_STATUS.PENDING,
-				description
-			};
-		} catch {
+			return encryptedMessage;
+		} catch (e) {
 			// Do nothing
+			console.error(e);
 		}
 
 		return message;
diff --git a/app/lib/methods/sendFileMessage/sendFileMessageV2.ts b/app/lib/methods/sendFileMessage/sendFileMessageV2.ts
index 80b9844f20d..30369aef2a9 100644
--- a/app/lib/methods/sendFileMessage/sendFileMessageV2.ts
+++ b/app/lib/methods/sendFileMessage/sendFileMessageV2.ts
@@ -73,7 +73,7 @@ export async function sendFileMessageV2(
 				'Content-Type': 'application/json'
 			},
 			body: JSON.stringify({
-				msg: file.msg || undefined,
+				msg: (content ? '' : file.msg) || undefined,
 				tmid: tmid || undefined,
 				description: file.description || undefined,
 				t: content ? 'e2e' : undefined,