diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 71be8396..b58b9992 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -52,6 +52,7 @@ breakdown:
   camera is null.
 - Fixed date dividers position/alignment in non reversed `MessageListView`.
 - Fixed `MessageListView` not opening to the right initialMessage if `StreamChannel.initialMessageId` is set.
+- Fixed null check errors when accessing `message.text` in `MessageWidget` and `MessageListView`; this occurred when sending a message with no text.
 
 ## 2.1.2
 
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index a8296231..731742b7 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -849,7 +849,7 @@ class _MessageListViewState extends State<MessageListView> {
   ) {
     final isMyMessage =
         message.user!.id == StreamChat.of(context).currentUser!.id;
-    final isOnlyEmoji = message.text!.isOnlyEmoji;
+    final isOnlyEmoji = message.text?.isOnlyEmoji ?? false;
     final currentUser = StreamChat.of(context).currentUser;
     final members = StreamChannel.of(context).channel.state?.members ?? [];
     final currentUserMember =
@@ -988,7 +988,7 @@ class _MessageListViewState extends State<MessageListView> {
 
     final showInChannelIndicator = !_isThreadConversation && isThreadMessage;
     final showThreadReplyIndicator = !_isThreadConversation && hasReplies;
-    final isOnlyEmoji = message.text!.isOnlyEmoji;
+    final isOnlyEmoji = message.text?.isOnlyEmoji ?? false;
 
     final hasUrlAttachment =
         message.attachments.any((it) => it.ogScrapeUrl != null) == true;
diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index 19af5b2a..ca1aa0bf 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -1048,7 +1048,7 @@ class _MessageWidgetState extends State<MessageWidget>
                 messageWidget: widget.copyWith(
                   key: const Key('MessageWidget'),
                   message: widget.message.copyWith(
-                    text: widget.message.text!.length > 200
+                    text: (widget.message.text?.length ?? 0) > 200
                         ? '${widget.message.text!.substring(0, 200)}...'
                         : widget.message.text,
                   ),
@@ -1111,7 +1111,7 @@ class _MessageWidgetState extends State<MessageWidget>
           messageWidget: widget.copyWith(
             key: const Key('MessageWidget'),
             message: widget.message.copyWith(
-              text: widget.message.text!.length > 200
+              text: (widget.message.text?.length ?? 0) > 200
                   ? '${widget.message.text!.substring(0, 200)}...'
                   : widget.message.text,
             ),
@@ -1258,7 +1258,7 @@ class _MessageWidgetState extends State<MessageWidget>
       );
 
   Widget _buildTextBubble() {
-    if (widget.message.text!.trim().isEmpty) return const Offstage();
+    if (widget.message.text?.trim().isEmpty ?? false) return const Offstage();
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [