diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart
index 321cb0f..40ee0a1 100644
--- a/lib/widgets/chat_page/room_chat.dart
+++ b/lib/widgets/chat_page/room_chat.dart
@@ -467,6 +467,11 @@ class RoomChat extends HookConsumerWidget {
                                   children: [
                                     SizedBox(height: 12),
                                     FlyerChatTextMessage(
+                                      topWidget: TopWidget(
+                                        message,
+                                        groupStatus: groupStatus,
+                                        alwaysShow: true,
+                                      ),
                                       message: TextMessage(
                                         id: "${message.id}-text",
                                         authorId: message.authorId,
@@ -475,15 +480,6 @@ class RoomChat extends HookConsumerWidget {
                                       index: index,
                                     ),
                                     FlyerChatImageMessage(
-                                      topWidget: TopWidget(
-                                        message,
-                                        groupStatus: MessageGroupStatus(
-                                          isFirst: false,
-                                          isLast: true,
-                                          isMiddle: false,
-                                        ),
-                                        alwaysShow: true,
-                                      ),
                                       customImageProvider: CachedNetworkImage(
                                         message.source,
                                         ref.watch(