diff --git a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt
index 67ee7f321b..9a410b94d5 100644
--- a/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt
+++ b/matrix-sdk-android/src/rustCrypto/java/org/matrix/android/sdk/internal/session/MigrateEAtoEROperation.kt
@@ -31,6 +31,9 @@ class MigrateEAtoEROperation {
             sessionFilesDir.mkdir()
             // perform a migration?
             val extractMigrationData = ExtractMigrationDataUseCase()
+            val hasExitingData = extractMigrationData.hasExistingData(cryptoRealm)
+            if (!hasExitingData) return sessionFilesDir
+
             try {
                 val progressListener = object : ProgressListener {
                     override fun onProgress(progress: Int, total: Int) {