diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
index 4646d74c9a17054c0d3485abb064f3af03a21330..e70c8b2d42608765871ffe8dd102b73b90f95cf8 100644
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
@@ -277,7 +277,7 @@ internal class OlmMachine @Inject constructor(
             val events = adapter.toJson(toDevice ?: ToDeviceSyncResponse())
 
             // field pass in the list of unused fallback keys here
-            val receiveSyncChanges = inner.receiveSyncChanges(events, devices, counts, deviceUnusedFallbackKeyTypes)
+            val receiveSyncChanges = inner.receiveSyncChanges(events, devices, counts, deviceUnusedFallbackKeyTypes,"").toDeviceEvents.toString()
 
             val outAdapter = moshi.adapter<List<Event>>(
                     Types.newParameterizedType(
diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractUtils.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractUtils.kt
index d99403fe194b1cce1648eb281aa3b351803bf5f1..d7ee5f488f864b8c98d8e07eb76cc581a258f9fd 100644
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractUtils.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/ExtractUtils.kt
@@ -100,7 +100,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData {
             )
             MigrationData(
                     account = pickledAccount,
-                    pickleKey = pickleKey.map { it.toUByte() },
+                    pickleKey = pickleKey,
                     crossSigning = CrossSigningKeyExport(
                             masterKey = masterKey,
                             selfSigningKey = selfSignedKey,
@@ -153,7 +153,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData {
 
                 migrationData = MigrationData(
                         account = pickledAccount,
-                        pickleKey = pickleKey.map { it.toUByte() },
+                        pickleKey = pickleKey,
                         crossSigning = CrossSigningKeyExport(
                                 masterKey = masterKey,
                                 selfSigningKey = selfSignedKey,