diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
index 26a9fba38f..f0feb2857d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
@@ -19,7 +19,7 @@ package io.element.android.libraries.matrix.impl.auth
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.matrix.rustcomponents.sdk.AuthenticationException as RustAuthenticationException
 
-fun Throwable.mapAuthenticationException(): Throwable {
+fun Throwable.mapAuthenticationException(): AuthenticationException {
     return when (this) {
         is RustAuthenticationException.ClientMissing -> AuthenticationException.ClientMissing(this.message!!)
         is RustAuthenticationException.Generic -> AuthenticationException.Generic(this.message!!)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
index a72755d129..6efca88f9b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
@@ -19,7 +19,7 @@ package io.element.android.libraries.matrix.impl.exception
 import io.element.android.libraries.matrix.api.exception.ClientException
 import org.matrix.rustcomponents.sdk.ClientException as RustClientException
 
-fun Throwable.mapClientException(): Throwable {
+fun Throwable.mapClientException(): ClientException {
     return when (this) {
         is RustClientException.Generic -> ClientException.Generic(msg)
         else -> ClientException.Other(message ?: "Unknown error")