diff --git a/packages/stream_chat_flutter/lib/src/message_text.dart b/packages/stream_chat_flutter/lib/src/message_text.dart
index a1e3a4f8..721e4670 100644
--- a/packages/stream_chat_flutter/lib/src/message_text.dart
+++ b/packages/stream_chat_flutter/lib/src/message_text.dart
@@ -31,9 +31,9 @@ class MessageText extends StatelessWidget {
   Widget build(BuildContext context) {
     final streamChat = StreamChat.of(context);
     assert(streamChat.currentUser != null, '');
-    return BetterStreamBuilder(
-      stream: streamChat.currentUserStream.map((it) => it!.language),
-      initialData: streamChat.currentUser!.language,
+    return BetterStreamBuilder<String>(
+      stream: streamChat.currentUserStream.map((it) => it!.language ?? 'en'),
+      initialData: streamChat.currentUser!.language ?? 'en',
       builder: (context, language) {
         final translatedText =
             message.i18n?['${language}_text'] ?? message.text;