diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
index 77ae28acea..cb387a9d21 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
@@ -51,16 +51,18 @@ class RustLinkMobileHandler(
             )
             // We emit Done in case the progress listener was deallocated before generate() sent the Done
             _linkMobileStep.emit(LinkMobileStep.Done)
-        } catch (e: HumanQrGrantLoginException) {
+        } catch (e: HumanQrGrantLoginException.NotFound) {
             Timber.tag(tag.value).w(e, "Error during QR login grant")
             // Catch timeout here?
-            if (_linkMobileStep.value is LinkMobileStep.QrReady
-                && e is HumanQrGrantLoginException.NotFound) {
+            if (_linkMobileStep.value is LinkMobileStep.QrReady) {
                 Timber.tag(tag.value).d("Emit QrRotating due to HumanQrGrantLoginException.NotFound")
                 _linkMobileStep.emit(LinkMobileStep.QrRotating)
             } else {
                 _linkMobileStep.emit(LinkMobileStep.Error(e.map()))
             }
+        } catch (e: HumanQrGrantLoginException) {
+            Timber.tag(tag.value).w(e, "Error during QR login grant")
+            _linkMobileStep.emit(LinkMobileStep.Error(e.map()))
         }
     }