diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 4de42be3a4..e14f6f4e0b 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -808,24 +808,12 @@ internal class DefaultCryptoService @Inject constructor(
     override fun exportRoomKeys(password: String, callback: MatrixCallback<ByteArray>) {
         cryptoCoroutineScope.launch(coroutineDispatchers.main) {
             runCatching {
-                exportRoomKeys(password, MXMegolmExportEncryption.DEFAULT_ITERATION_COUNT)
+                val iterationCount = max(10000, MXMegolmExportEncryption.DEFAULT_ITERATION_COUNT)
+                olmMachine!!.exportKeys(password, iterationCount)
             }.foldToCallback(callback)
         }
     }
 
-    /**
-     * Export the crypto keys
-     *
-     * @param password         the password
-     * @param anIterationCount the encryption iteration count
-     */
-    private suspend fun exportRoomKeys(password: String, anIterationCount: Int): ByteArray {
-        return withContext(coroutineDispatchers.crypto) {
-            val iterationCount = max(10000, anIterationCount)
-            olmMachine!!.exportKeys(password, iterationCount)
-        }
-    }
-
     /**
      * Import the room keys
      *