diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index f7964c1e..d14e9a54 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -2259,7 +2259,8 @@ class MessageInputState extends State<MessageInput> {
   }
 
   void _parseExistingMessage(Message message) {
-    _textEditingController.text = message.text!;
+    final messageText = message.text;
+    if (messageText != null) textEditingController.text = messageText;
     _addAttachments(message.attachments);
   }