diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
index 6a1c3de291..21e759cf10 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
@@ -51,7 +51,6 @@ import uniffi.olm.OlmMachine as InnerMachine
 import uniffi.olm.ProgressListener as RustProgressListener
 import uniffi.olm.Request
 import uniffi.olm.RequestType
-import uniffi.olm.Verification as InnerVerification
 import uniffi.olm.setLogger
 
 class CryptoLogger : Logger {
@@ -462,7 +461,9 @@ internal class OlmMachine(
      */
     @Throws(CryptoStoreErrorException::class)
     suspend fun getUserDevices(userId: String): List<CryptoDeviceInfo> {
-        val devices = inner.getUserDevices(userId).map { toCryptoDeviceInfo(it) }.toMutableList()
+        val devices = withContext(Dispatchers.IO) {
+            inner.getUserDevices(userId).map { toCryptoDeviceInfo(it) }.toMutableList()
+        }
 
         // EA doesn't differentiate much between our own and other devices of
         // while the rust-sdk does, append our own device here.