diff --git a/src/components/chatMixin.js b/src/components/chatMixin.js
index 23c1941..29beffd 100644
--- a/src/components/chatMixin.js
+++ b/src/components/chatMixin.js
@@ -226,7 +226,7 @@ export default {
               }
               return null;
             }
-            if (!isForExport && event.uploadBatch) {
+            if (!isForExport && event.uploadBatch && event.uploadBatch.sendingStatus !== 'sent') {
               return MessageThreadSending;
             }
             if (event.isMxThread) {
diff --git a/src/models/attachmentManager.ts b/src/models/attachmentManager.ts
index dcd8658..544c2d1 100644
--- a/src/models/attachmentManager.ts
+++ b/src/models/attachmentManager.ts
@@ -560,8 +560,7 @@ export const createUploadBatch = (manager: AttachmentManager | null, room: Room
     });
 
     totalOriginalFileSize.value = attachments.value.reduce((cb, item) => {
-      const thisFileCurrent = item.scaledFile && item.useScaled ? item.scaledFile.size : item.file.size;
-      return cb + thisFileCurrent;
+      return cb + item.file.size;
     }, 0);
 
     const onLocalEchoUpdated = (event: KeanuEvent) => {