diff --git a/experimental/examples/todoapp-lite/shared/src/commonMain/kotlin/example/todoapp/lite/common/RootContent.kt b/experimental/examples/todoapp-lite/shared/src/commonMain/kotlin/example/todoapp/lite/common/RootContent.kt
index dda40d34d2..be89e02ccf 100644
--- a/experimental/examples/todoapp-lite/shared/src/commonMain/kotlin/example/todoapp/lite/common/RootContent.kt
+++ b/experimental/examples/todoapp-lite/shared/src/commonMain/kotlin/example/todoapp/lite/common/RootContent.kt
@@ -34,5 +34,5 @@ internal fun RootContent(modifier: Modifier = Modifier) {
 private val RootState.editingItem: TodoItem?
     get() = editingItemId?.let(items::firstById)
 
-private fun List<TodoItem>.firstById(id: Long): TodoItem =
-    first { it.id == id }
+private fun List<TodoItem>.firstById(id: Long): TodoItem? =
+    firstOrNull { it.id == id }