diff --git a/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift b/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift
index b359375c4..0f53f8b15 100644
--- a/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift
+++ b/ElementX/Sources/Services/Authentication/LinkNewDeviceService.swift
@@ -195,13 +195,13 @@ private extension QRCodeLoginError {
             .connectionInsecure
         case .UnsupportedProtocol:
             .linkingNotSupported
-        case .Expired, .NotFound: // The most likely cause of a .NotFound is that the rendezvous session expired on the server side
+        case .Expired, .NotFound, .DeviceNotFound:
             .expired
         case .Cancelled:
             .cancelled
         case .OtherDeviceAlreadySignedIn:
             .deviceAlreadySignedIn
-        case .Unknown, .MissingSecretsBackup, .DeviceIdAlreadyInUse, .UnableToCreateDevice:
+        case .Unknown, .MissingSecretsBackup, .DeviceIdAlreadyInUse:
             .unknown
         }
     }