diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
index 9b47d8040b..59165463bb 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
@@ -28,7 +28,7 @@ import org.matrix.rustcomponents.sdk.TimelineItem
 internal fun TimelineDiff.eventOrigin(): EventItemOrigin? {
     return when (change()) {
         TimelineChange.APPEND -> {
-            append()?.first()?.eventOrigin()
+            append()?.firstOrNull()?.eventOrigin()
         }
         TimelineChange.PUSH_BACK -> {
             pushBack()?.eventOrigin()
@@ -43,7 +43,7 @@ internal fun TimelineDiff.eventOrigin(): EventItemOrigin? {
             insert()?.item?.eventOrigin()
         }
         TimelineChange.RESET -> {
-            reset()?.first()?.eventOrigin()
+            reset()?.firstOrNull()?.eventOrigin()
         }
         else -> null
     }