diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index aeacab8d..6c9c4c32 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -138,7 +138,8 @@ class _MessageInputState extends State<MessageInput> {
 
   AnimatedCrossFade _animateSendButton(BuildContext context) {
     return AnimatedCrossFade(
-      crossFadeState: (_messageIsPresent || _attachments.isNotEmpty)
+      crossFadeState: ((_messageIsPresent || _attachments.isNotEmpty) &&
+              _attachments.every((a) => a.uploaded == true))
           ? CrossFadeState.showFirst
           : CrossFadeState.showSecond,
       firstChild: _buildSendButton(context),