diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 76435c8e18..e32fe5f2b9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -129,7 +129,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.14"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.15"
 sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
 sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventSendState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventSendState.kt
index 8a3af60903..d41bc2edc0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventSendState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventSendState.kt
@@ -19,7 +19,7 @@ package io.element.android.libraries.matrix.api.timeline.item.event
 import io.element.android.libraries.matrix.api.core.EventId
 
 sealed interface EventSendState {
-    object NotSendYet : EventSendState
+    object NotSentYet : EventSendState
 
     data class SendingFailed(
         val error: String
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 57dc8c2fc9..95654be1f0 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -58,7 +58,6 @@ import org.matrix.rustcomponents.sdk.RequiredState
 import org.matrix.rustcomponents.sdk.SlidingSyncList
 import org.matrix.rustcomponents.sdk.SlidingSyncListBuilder
 import org.matrix.rustcomponents.sdk.SlidingSyncListOnceBuilt
-import org.matrix.rustcomponents.sdk.SlidingSyncMode
 import org.matrix.rustcomponents.sdk.SlidingSyncRequestListFilters
 import org.matrix.rustcomponents.sdk.TaskHandle
 import org.matrix.rustcomponents.sdk.mediaSourceFromUrl
@@ -119,7 +118,7 @@ class RustMatrixClient constructor(
             )
         )
         .filters(visibleRoomsSlidingSyncFilters)
-        .syncMode(mode = SlidingSyncMode.SELECTIVE)
+        .syncModeSelective()
         .addRange(0u, 20u)
         .onceBuilt(object : SlidingSyncListOnceBuilt {
             override fun updateList(list: SlidingSyncList): SlidingSyncList {
@@ -141,7 +140,7 @@ class RustMatrixClient constructor(
             )
         )
         .filters(invitesSlidingSyncFilters)
-        .syncMode(mode = SlidingSyncMode.SELECTIVE)
+        .syncModeSelective()
         .addRange(0u, 20u)
         .onceBuilt(object : SlidingSyncListOnceBuilt {
             override fun updateList(list: SlidingSyncList): SlidingSyncList {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt
index 0019589b94..4884dc2d84 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt
@@ -156,7 +156,8 @@ class RustMatrixTimeline(
                 ),
                 timelineLimit = null
             )
-            val result = slidingSyncRoom.subscribeAndAddTimelineListener(timelineListener, settings)
+            listenerTokens += slidingSyncRoom.subscribeToRoom(settings)
+            val result = slidingSyncRoom.addTimelineListener(timelineListener)
             launch {
                 fetchMembers()
             }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
index 726b448099..0f6a818cca 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
@@ -63,7 +63,7 @@ fun RustProfileDetails.map(): ProfileTimelineDetails {
 fun RustEventSendState?.map(): EventSendState? {
     return when (this) {
         null -> null
-        RustEventSendState.NotSendYet -> EventSendState.NotSendYet
+        RustEventSendState.NotSentYet -> EventSendState.NotSentYet
         is RustEventSendState.SendingFailed -> EventSendState.SendingFailed(error)
         is RustEventSendState.Sent -> EventSendState.Sent(EventId(eventId))
     }