diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 899179a5..c1ec13ac 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Upcoming
+
+🐞 Fixed
+- [[#1424]](https://github.com/GetStream/stream-chat-flutter/issues/1424) Fixed a render issue when showing messages starting with 4 whitespaces.
+
 ## 5.2.0
 
 ✅ Added
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/message_text.dart b/packages/stream_chat_flutter/lib/src/message_widget/message_text.dart
index f686a3c8..947d76c4 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/message_text.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/message_text.dart
@@ -40,7 +40,8 @@ class StreamMessageText extends StatelessWidget {
             .translate(language)
             .replaceMentions()
             .text
-            ?.replaceAll('\n', '\n\n');
+            ?.replaceAll('\n', '\n\n')
+            .trim();
         final themeData = Theme.of(context);
         return MarkdownBody(
           data: messageText ?? '',