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 c7966c3d..b5008054 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -575,24 +575,26 @@ class _MessageListViewState extends State<MessageListView> {
                           const Offstage();
                     }
 
-                    final message = messages[i - 2];
+                    final topMessageIndex = itemCount - 4;
+                    const bottomMessageIndex = 2;
 
+                    final message = messages[i - 2];
                     Widget messageWidget;
 
-                    if (i == 2) {
-                      messageWidget = _buildBottomMessage(
-                        context,
-                        message,
-                        messages,
-                        streamChannel!,
-                      );
-                    } else if (i == messages.length - 4) {
+                    if (i == topMessageIndex) {
                       messageWidget = _buildTopMessage(
                         context,
                         message,
                         messages,
                         streamChannel,
                       );
+                    } else if (i == bottomMessageIndex) {
+                      messageWidget = _buildBottomMessage(
+                        context,
+                        message,
+                        messages,
+                        streamChannel!,
+                      );
                     } else {
                       if (widget.messageBuilder != null) {
                         messageWidget = Builder(