diff --git a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
index 96d1cff2..f7fbc277 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart
@@ -227,7 +227,9 @@ class FileAttachment extends AttachmentWidget {
           },
         );
 
-    if (message.status == null || message.status == MessageSendingStatus.sent) {
+    if (message != null &&
+        (message.status == null ||
+            message.status == MessageSendingStatus.sent)) {
       trailingWidget = IconButton(
         icon: StreamSvgIcon.cloudDownload(color: theme.colorTheme.black),
         padding: const EdgeInsets.all(8),
@@ -253,6 +255,9 @@ class FileAttachment extends AttachmentWidget {
     );
     return attachment.uploadState?.when(
           preparing: () {
+            if (message == null) {
+              return Text('${fileSize(size, 2)}', style: textStyle);
+            }
             return UploadProgressIndicator(
               uploaded: 0,
               total: double.maxFinite.toInt(),