diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
index 58ee9ffd88..84609872d0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
@@ -60,7 +60,7 @@ fun IdentityChangeStateView(
                 addLink(
                     url = LinkAnnotation.Url(
                         url = LearnMoreConfig.IDENTITY_CHANGE_URL,
-                        linkInteractionListener = { t ->
+                        linkInteractionListener = {
                             onLinkClick(LearnMoreConfig.IDENTITY_CHANGE_URL)
                         }
                     ),
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
index b356ce7715..cdcea1cafa 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
@@ -205,7 +205,7 @@ internal class RustEncryptionService(
     }
 
     override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatching {
-        val userIdentity = service.getUserIdentity(userId.value)
+        val userIdentity = service.getUserIdentity(userId.value) ?: throw IllegalStateException("User identity not found")
         userIdentity.pin()
     }
 }