diff --git a/sama_chat_client/lib/src/db/db_service.dart b/sama_chat_client/lib/src/db/db_service.dart
index 20ff981..0f422f9 100644
--- a/sama_chat_client/lib/src/db/db_service.dart
+++ b/sama_chat_client/lib/src/db/db_service.dart
@@ -445,9 +445,6 @@ class DatabaseService {
   Future<void> assignMessage(MessageModel msg, MessageModel msgInDb) async {
     msg.bid = msgInDb.bid;
     msg.replyMessage = msgInDb.replyMessage;
-    if (msg.attachments.isNotEmpty) {
-      msg.attachments.clear();
-    }
   }
 
   Future<bool> removeMessageLocal(String id) async {
diff --git a/sama_chat_client/lib/src/features/conversation/view/messages_list.dart b/sama_chat_client/lib/src/features/conversation/view/messages_list.dart
index 08e03e4..ebeb570 100644
--- a/sama_chat_client/lib/src/features/conversation/view/messages_list.dart
+++ b/sama_chat_client/lib/src/features/conversation/view/messages_list.dart
@@ -82,13 +82,13 @@ class _MessagesListState extends State<MessagesList> {
         ],
         child: Stack(children: [
           BlocSelector<ConversationBloc, ConversationState,
-              ({ConversationStatus status, bool initial})>(
+              ({ConversationStatus status, bool initial, bool isEmptyMsgs})>(
             selector: (state) => (
               status: state.status,
               initial: state.initial,
+              isEmptyMsgs: state.messages.isEmpty
             ),
             builder: (context, data) {
-              var state = context.read<ConversationBloc>().state;
               switch (data.status) {
                 case ConversationStatus.failure:
                   WidgetsBinding.instance
@@ -102,7 +102,7 @@ class _MessagesListState extends State<MessagesList> {
                   continue success;
                 success:
                 case ConversationStatus.success:
-                  if (state.messages.isEmpty) {
+                  if (data.isEmptyMsgs) {
                     return data.initial
                         ? const Center(child: CircularProgressIndicator())
                         : Center(