diff --git a/app/lib/encryption/encryption.ts b/app/lib/encryption/encryption.ts
index de401c64d0..4b7dee5c61 100644
--- a/app/lib/encryption/encryption.ts
+++ b/app/lib/encryption/encryption.ts
@@ -540,7 +540,7 @@ class Encryption {
 		}
 
 		const { E2E_Enable_Encrypt_Files } = store.getState().settings;
-		if (!subscription.encrypted || !E2E_Enable_Encrypt_Files) {
+		if (!subscription.encrypted || (E2E_Enable_Encrypt_Files !== undefined && !E2E_Enable_Encrypt_Files)) {
 			// Send a non encrypted message
 			return { file };
 		}