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 7681dda6f0..d29a233aa1 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
@@ -60,6 +60,9 @@ class RustMatrixClientFactory @Inject constructor(
             .homeserverUrl(sessionData.homeserverUrl)
             .username(sessionData.userId)
             .setSessionDelegate(sessionDelegate)
+            .roomKeyRecipientStrategy(
+                strategy = CollectStrategy.DeviceBasedStrategy(false, true)
+            )
             .use { it.build() }
 
         client.restoreSession(sessionData.toSession())