diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
index cd0733695b..0899b16325 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
@@ -16,8 +16,8 @@ import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.QrCodeData
 
 class FakeFfiGrantLoginWithQrCodeHandler(
-    private val generateResult: () -> Unit = {},
-    private val scanResult: (QrCodeData) -> Unit = {},
+    private val generateResult: suspend () -> Unit = {},
+    private val scanResult: suspend (QrCodeData) -> Unit = {},
 ) : GrantLoginWithQrCodeHandler(NoHandle) {
     private var generateProgressListener: GrantGeneratedQrLoginProgressListener? = null
     private var scanProgressListener: GrantQrLoginProgressListener? = null
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
index a180e4d515..fd635e2da6 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
@@ -15,6 +15,7 @@ import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
 import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiGrantLoginWithQrCodeHandler
 import io.element.android.libraries.matrix.test.QR_CODE_DATA
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -29,7 +30,13 @@ import org.matrix.rustcomponents.sdk.QrCodeDecodeException
 class RustLinkDesktopHandlerTest {
     @Test
     fun `handleScannedQrCode function works as expected`() = runTest {
-        val handler = FakeFfiGrantLoginWithQrCodeHandler()
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            scanResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
         val sut = createRustLinkDesktopHandler(
             handler,
         )
@@ -53,6 +60,36 @@ class RustLinkDesktopHandlerTest {
                 handler.emitScanProgress(progress)
                 assertThat(awaitItem()).isEqualTo(expectedStep)
             }
+            // scan returns, no new event is emitted
+            completable.complete(Unit)
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when scan does not emits the Done state, the code emits it`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            scanResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
+        val sut = createRustLinkDesktopHandler(
+            handler,
+        )
+        sut.linkDesktopStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkDesktopStep.Uninitialized)
+            backgroundScope.launch {
+                sut.handleScannedQrCode(QR_CODE_DATA)
+            }
+            runCurrent()
+            handler.emitScanProgress(GrantQrLoginProgress.Starting)
+            assertThat(awaitItem()).isEqualTo(LinkDesktopStep.Starting)
+            // scan returns, Done event is emitted
+            completable.complete(Unit)
+            assertThat(awaitItem()).isEqualTo(LinkDesktopStep.Done)
         }
     }
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
index aa13996e8a..9f71cb7169 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
@@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiCheckCodeS
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiGrantLoginWithQrCodeHandler
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiQrCodeData
 import io.element.android.libraries.matrix.test.QR_CODE_DATA_RECIPROCATE
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -30,7 +31,13 @@ import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
 class RustLinkMobileHandlerTest {
     @Test
     fun `start function works as expected`() = runTest {
-        val handler = FakeFfiGrantLoginWithQrCodeHandler()
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
         val sut = createRustLinkMobileHandler(
             handler,
         )
@@ -56,6 +63,36 @@ class RustLinkMobileHandlerTest {
                 handler.emitGenerateProgress(progress)
                 assertThat(awaitItem()).isInstanceOf(expectedStepClass)
             }
+            // generate returns, no new event is emitted
+            completable.complete(Unit)
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when generates does not emits the Done state, the code emits it`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            handler.emitGenerateProgress(GrantGeneratedQrLoginProgress.Starting)
+            assertThat(awaitItem()).isEqualTo(LinkMobileStep.Starting)
+            // generate returns, Done event is emitted
+            completable.complete(Unit)
+            assertThat(awaitItem()).isEqualTo(LinkMobileStep.Done)
         }
     }