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 f32401f0a6..c8e1e93eb4 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
@@ -116,14 +116,14 @@ import org.matrix.rustcomponents.sdk.SyncService as ClientSyncService
 @OptIn(ExperimentalCoroutinesApi::class)
 class RustMatrixClient(
     private val client: Client,
-    private val syncService: ClientSyncService,
+    private val baseDirectory: File,
     private val sessionStore: SessionStore,
     private val appCoroutineScope: CoroutineScope,
-    private val dispatchers: CoroutineDispatchers,
-    private val baseDirectory: File,
-    baseCacheDirectory: File,
-    private val clock: SystemClock,
     private val sessionDelegate: RustClientSessionDelegate,
+    syncService: ClientSyncService,
+    dispatchers: CoroutineDispatchers,
+    baseCacheDirectory: File,
+    clock: SystemClock,
     timelineEventTypeFilterFactory: TimelineEventTypeFilterFactory,
 ) : MatrixClient {
     override val sessionId: UserId = UserId(client.userId())
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
index 51c502ce6a..507e63b4e7 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
@@ -70,14 +70,14 @@ class RustMatrixClientFactory @Inject constructor(
 
         RustMatrixClient(
             client = client,
-            syncService = syncService,
+            baseDirectory = baseDirectory,
             sessionStore = sessionStore,
             appCoroutineScope = appCoroutineScope,
+            sessionDelegate = sessionDelegate,
+            syncService = syncService,
             dispatchers = coroutineDispatchers,
-            baseDirectory = baseDirectory,
             baseCacheDirectory = cacheDirectory,
             clock = clock,
-            sessionDelegate = sessionDelegate,
             timelineEventTypeFilterFactory = timelineEventTypeFilterFactory,
         ).also {
             Timber.tag(it.toString()).d("Creating Client with access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'")
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt
index a7cc5fcb2a..22dd53b7f6 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt
@@ -26,18 +26,18 @@ class RustMatrixClientTest {
         val sessionStore = InMemorySessionStore()
         val sut = RustMatrixClient(
             client = FakeRustClient(),
-            syncService = FakeRustSyncService(),
+            baseDirectory = File(""),
             sessionStore = InMemorySessionStore(),
             appCoroutineScope = this,
-            dispatchers = testCoroutineDispatchers(),
-            baseDirectory = File(""),
-            baseCacheDirectory = File(""),
-            clock = FakeSystemClock(),
             sessionDelegate = RustClientSessionDelegate(
                 sessionStore = sessionStore,
                 appCoroutineScope = this,
                 coroutineDispatchers = testCoroutineDispatchers(),
             ),
+            syncService = FakeRustSyncService(),
+            dispatchers = testCoroutineDispatchers(),
+            baseCacheDirectory = File(""),
+            clock = FakeSystemClock(),
             timelineEventTypeFilterFactory = FakeTimelineEventTypeFilterFactory(),
         )
         assertThat(sut.sessionId).isEqualTo(A_USER_ID)