diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index de4c8cc1a..d7027e537 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -100,7 +100,7 @@ class MessageModel
 
     val isOutgoing = chatMessage.isOutgoing
 
-    val isInError = chatMessage.state == ChatMessage.State.NotDelivered
+    val isInError = MutableLiveData<Boolean>()
 
     val timestamp = chatMessage.time
 
@@ -224,6 +224,7 @@ class MessageModel
                     }
                 }
             }
+            isInError.postValue(messageState == ChatMessage.State.NotDelivered)
         }
 
         @WorkerThread
@@ -297,6 +298,8 @@ class MessageModel
     init {
         updateAvatarModel()
 
+        isInError.postValue(chatMessage.state == ChatMessage.State.NotDelivered)
+
         groupedWithNextMessage.postValue(isGroupedWithNextOne)
         groupedWithPreviousMessage.postValue(isGroupedWithPreviousOne)
         isPlayingVoiceRecord.postValue(false)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt
index d56aa551f..32e65c0aa 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt
@@ -72,7 +72,6 @@ class ChatMessageLongPressViewModel : GenericViewModel() {
 
     val onDismissedEvent = MutableLiveData<Event<Boolean>>()
 
-    private lateinit var emojiBottomSheet: ChatBubbleEmojiPickerBottomSheetBinding
     private lateinit var emojiBottomSheetBehavior: BottomSheetBehavior<View>
 
     init {
@@ -91,7 +90,7 @@ class ChatMessageLongPressViewModel : GenericViewModel() {
         hideCopyTextToClipboard.value = model.text.value.isNullOrEmpty()
         isChatRoomReadOnly.value = model.chatRoomIsReadOnly
         isMessageOutgoing.value = model.isOutgoing
-        isMessageInError.value = model.isInError
+        isMessageInError.value = model.isInError.value == true
         horizontalBias.value = if (model.isOutgoing) 1f else 0f
         messageModel.value = model