diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
index cd5dcf95b3..02b71b7291 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
@@ -32,8 +32,17 @@ sealed class ChangeServerError : Exception() {
     companion object {
         fun from(error: Throwable): ChangeServerError = when (error) {
             is ChangeServerError -> error
-            is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
-            is AuthenticationException.Oidc -> Error(messageStr = error.message)
+            is AuthenticationException -> {
+                when (error) {
+                    is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
+                    is AuthenticationException.InvalidServerName,
+                    is AuthenticationException.ServerUnreachable -> InvalidServer
+                    // AccountAlreadyLoggedIn error should not happen at this point
+                    is AuthenticationException.AccountAlreadyLoggedIn -> Error(messageStr = error.message)
+                    is AuthenticationException.Generic -> Error(messageStr = error.message)
+                    is AuthenticationException.Oidc -> Error(messageStr = error.message)
+                }
+            }
             is AccountProviderAccessException.NeedElementProException -> NeedElementPro(
                 unauthorisedAccountProviderTitle = error.unauthorisedAccountProviderTitle,
                 applicationId = error.applicationId,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
index 7370135729..954a8e9de2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
@@ -14,6 +14,7 @@ sealed class AuthenticationException(message: String?) : Exception(message) {
 
     class InvalidServerName(message: String?) : AuthenticationException(message)
     class SlidingSyncVersion(message: String?) : AuthenticationException(message)
+    class ServerUnreachable(message: String?) : AuthenticationException(message)
     class Oidc(message: String?) : AuthenticationException(message)
     class Generic(message: String?) : AuthenticationException(message)
 }
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 1960fe7c60..ba43065fad 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 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
             is ClientBuildException.InvalidServerName -> AuthenticationException.InvalidServerName(message)
             is ClientBuildException.SlidingSyncVersion -> AuthenticationException.SlidingSyncVersion(message)
             is ClientBuildException.Sdk -> AuthenticationException.Generic(message)
-            is ClientBuildException.ServerUnreachable -> AuthenticationException.Generic(message)
+            is ClientBuildException.ServerUnreachable -> AuthenticationException.ServerUnreachable(message)
             is ClientBuildException.SlidingSync -> AuthenticationException.Generic(message)
             is ClientBuildException.WellKnownDeserializationException -> AuthenticationException.Generic(message)
             is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
index c73ba1424b..db37fc40b5 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
@@ -16,10 +16,10 @@ import org.matrix.rustcomponents.sdk.OidcException
 
 class AuthenticationExceptionMappingTest {
     @Test
-    fun `mapping an exception with no message returns 'Unknown error' message`() {
+    fun `mapping an exception with no message returns null message`() {
         val exception = Exception()
         val mappedException = exception.mapAuthenticationException()
-        assertThat(mappedException.message).isEqualTo("Unknown error")
+        assertThat(mappedException.message).isEqualTo(null)
     }
 
     @Test
@@ -46,7 +46,7 @@ class AuthenticationExceptionMappingTest {
         assertThat(ClientBuildException.Sdk("SDK issue").mapAuthenticationException())
             .isException<AuthenticationException.Generic>("SDK issue")
         assertThat(ClientBuildException.ServerUnreachable("Server unreachable").mapAuthenticationException())
-            .isException<AuthenticationException.Generic>("Server unreachable")
+            .isException<AuthenticationException.ServerUnreachable>("Server unreachable")
         assertThat(ClientBuildException.SlidingSync("Sliding Sync").mapAuthenticationException())
             .isException<AuthenticationException.Generic>("Sliding Sync")
         assertThat(ClientBuildException.WellKnownDeserializationException("WellKnown Deserialization").mapAuthenticationException())