diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index e8f289c27..9dd38fc13 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -317,7 +317,7 @@ internal fun ChatRoomCreationFragment.navigateToChatRoom(args: Bundle) {
         findNavController().navigate(
             R.id.action_chatRoomCreationFragment_to_detailChatRoomFragment,
             args,
-            popupTo(R.id.detailChatRoomFragment, true)
+            popupTo(R.id.chatRoomCreationFragment, true)
         )
     }
 }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
index e91decdc7..7fd7402d3 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
@@ -74,6 +74,8 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
 
     val peerSipUri = MutableLiveData<String>()
 
+    val ephemeralEnabled = MutableLiveData<Boolean>()
+
     val oneToOneChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())
 
     val encryptedChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.Encrypted.toInt())
@@ -199,6 +201,10 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
             lastMessageText.value = formatLastMessage(chatRoom.lastMessageInHistory)
         }
 
+        override fun onEphemeralEvent(chatRoom: ChatRoom, eventLog: EventLog) {
+            ephemeralEnabled.value = chatRoom.ephemeralEnabled()
+        }
+
         override fun onParticipantAdminStatusChanged(chatRoom: ChatRoom, eventLog: EventLog) {
             meAdmin.value = chatRoom.me?.isAdmin ?: false
         }
@@ -216,6 +222,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         subject.value = chatRoom.subject
         updateSecurityIcon()
         meAdmin.value = chatRoom.me?.isAdmin ?: false
+        ephemeralEnabled.value = chatRoom.ephemeralEnabled()
 
         contactLookup()
         updateParticipants()
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index ffa4b7e22..4dfd4676e 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -124,7 +124,7 @@
                 android:maxLines="2" />
 
             <ImageView
-                android:visibility="@{viewModel.chatRoom.ephemeralEnabled() ? View.VISIBLE : View.GONE, default=gone}"
+                android:visibility="@{viewModel.ephemeralEnabled ? View.VISIBLE : View.GONE, default=gone}"
                 android:id="@+id/ephemeral"
                 android:contentDescription="@string/content_description_ephemeral_chat_room"
                 android:layout_width="20dp"