diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
index a4f7d09db..27a9c7334 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
@@ -303,8 +303,8 @@ class MainViewModel @UiThread constructor() : ViewModel() {
 
             core.addListener(coreListener)
 
-            if (!core.isNetworkReachable) {
-                Log.w("$TAG Network is not reachable!")
+            if (!core.isNetworkReachable && core.globalState == GlobalState.On) {
+                Log.w("$TAG Core is ON & network is not reachable!")
                 val label = AppUtils.getString(R.string.network_not_reachable)
                 addAlert(NETWORK_NOT_REACHABLE, label)
             }
@@ -554,7 +554,7 @@ class MainViewModel @UiThread constructor() : ViewModel() {
     private fun checkNetworkReachability() {
         val reachable = coreContext.core.isNetworkReachable
         Log.i("$TAG Network is ${if (reachable) "reachable" else "not reachable"}")
-        if (!reachable) {
+        if (!reachable && coreContext.core.globalState == GlobalState.On) {
             val label = AppUtils.getString(R.string.network_not_reachable)
             addAlert(NETWORK_NOT_REACHABLE, label)
         } else {
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index 3a43995ce..0767f9f22 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -90,7 +90,7 @@
             android:text="@{model.lastMessageTextSender, default=`John Doe:`}"
             android:textSize="14sp"
             android:textColor="?attr/color_main2_400"
-            android:visibility="@{model.lastMessageTextSender.length() > 0 ? View.VISIBLE : View.GONE}"
+            android:visibility="@{model.isBeingDeleted || model.lastMessageTextSender.length() == 0 || model.isComposing ? View.GONE : View.VISIBLE}"
             textFont="@{model.isBeingDeleted || model.unreadMessageCount > 0 || model.isComposing ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
             app:layout_constraintStart_toStartOf="@id/title"
             app:layout_constraintEnd_toStartOf="@id/last_message_forward"