diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eadb1af6ab..bf6eb60056 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -169,7 +169,7 @@ jsoup = "org.jsoup:jsoup:1.20.1"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.4.22"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.4.30"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
index be8b2c9eea..af6269244e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
@@ -22,7 +22,6 @@ class OidcConfigurationProvider @Inject constructor(
         logoUri = OidcConfig.LOGO_URI,
         tosUri = OidcConfig.TOS_URI,
         policyUri = OidcConfig.POLICY_URI,
-        contacts = null,
         staticRegistrations = OidcConfig.STATIC_REGISTRATIONS,
     )
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index 2c3ba422d1..b17f234326 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -73,6 +73,7 @@ import org.matrix.rustcomponents.sdk.MessageFormat
 import org.matrix.rustcomponents.sdk.PollData
 import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
 import org.matrix.rustcomponents.sdk.UploadParameters
+import org.matrix.rustcomponents.sdk.UploadSource
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk.RoomPaginationStatus
@@ -361,7 +362,7 @@ class RustTimeline(
         return sendAttachment(listOfNotNull(file, thumbnailFile)) {
             inner.sendImage(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -390,7 +391,7 @@ class RustTimeline(
         return sendAttachment(listOfNotNull(file, thumbnailFile)) {
             inner.sendVideo(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -418,7 +419,7 @@ class RustTimeline(
         return sendAttachment(listOf(file)) {
             inner.sendAudio(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -445,7 +446,7 @@ class RustTimeline(
         return sendAttachment(listOf(file)) {
             inner.sendFile(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -506,7 +507,7 @@ class RustTimeline(
         return sendAttachment(listOf(file)) {
             inner.sendVoiceMessage(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     // Maybe allow a caption in the future?
                     caption = null,
                     formattedCaption = null,