diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt
index 3bfb6c0564332cf634bfc2d653d8e8b100a97ea4..412372c4abede7a5f684b1b83ab96d2a3ddab5fe 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt
@@ -410,13 +410,10 @@ class Conversation : ConversationHistory {
     @Synchronized
     fun sortHistory() {
         if (mDirty) {
-            //Log.w(TAG, "sortHistory()")
             aggregateHistory.sortWith { c1, c2 -> c1.timestamp.compareTo(c2.timestamp) }
-            for (i in aggregateHistory.asReversed())
-                if (i.type != Interaction.InteractionType.INVALID) {
-                    lastEventSubject.onNext(aggregateHistory.last())
-                    break
-                }
+            aggregateHistory.lastOrNull { it.type != Interaction.InteractionType.INVALID }?.let {
+                lastEventSubject.onNext(it)
+            }
             mDirty = false
         }
     }