diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 458cc5ac0..d7af1008f 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -281,12 +281,14 @@ class HtmlMessage extends StatelessWidget {
     final renderer = TokenRenderingUtil(
       pangeaMessageEvent: pangeaMessageEvent,
       readingAssistanceMode: readingAssistanceMode,
-      existingStyle: textStyle.merge(
-        AppConfig.messageTextStyle(
-          pangeaMessageEvent!.event,
-          textColor,
-        ),
-      ),
+      existingStyle: pangeaMessageEvent != null
+          ? textStyle.merge(
+              AppConfig.messageTextStyle(
+                pangeaMessageEvent!.event,
+                textColor,
+              ),
+            )
+          : textStyle,
       overlayController: overlayController,
       isTransitionAnimation: isTransitionAnimation,
     );
diff --git a/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart b/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
index 995260793..f6d7a10bc 100644
--- a/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
+++ b/lib/pangea/chat_list/utils/get_chat_list_item_subtitle.dart
@@ -89,12 +89,16 @@ class ChatListItemSubtitle extends StatelessWidget {
           return Text(
             pangeaMessageEvent.messageDisplayText,
             style: style,
+            maxLines: 2,
+            overflow: TextOverflow.ellipsis,
           );
         }
 
         return Text(
           L10n.of(context).emptyChat,
           style: style,
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
         );
       },
     );