diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
index 2116063626..71ba71b915 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
@@ -86,13 +86,16 @@ private fun toFailure(errorBody: ResponseBody?, httpCode: Int, globalErrorReceiv
         val matrixError = matrixErrorAdapter.fromJson(errorBodyStr)
 
         if (matrixError != null) {
-            if (matrixError.code == MatrixError.M_CONSENT_NOT_GIVEN && !matrixError.consentUri.isNullOrBlank()) {
-                // Also send this error to the globalErrorReceiver, for a global management
-                globalErrorReceiver?.handleGlobalError(GlobalError.ConsentNotGivenError(matrixError.consentUri))
-            } else if (httpCode == HttpURLConnection.HTTP_UNAUTHORIZED /* 401 */
-                    && matrixError.code == MatrixError.M_UNKNOWN_TOKEN) {
-                // Also send this error to the globalErrorReceiver, for a global management
-                globalErrorReceiver?.handleGlobalError(GlobalError.InvalidToken(matrixError.isSoftLogout.orFalse()))
+            when {
+                matrixError.code == MatrixError.M_CONSENT_NOT_GIVEN && !matrixError.consentUri.isNullOrBlank() -> {
+                    // Also send this error to the globalErrorReceiver, for a global management
+                    globalErrorReceiver?.handleGlobalError(GlobalError.ConsentNotGivenError(matrixError.consentUri))
+                }
+                httpCode == HttpURLConnection.HTTP_UNAUTHORIZED /* 401 */
+                        && matrixError.code == MatrixError.M_UNKNOWN_TOKEN                                     -> {
+                    // Also send this error to the globalErrorReceiver, for a global management
+                    globalErrorReceiver?.handleGlobalError(GlobalError.InvalidToken(matrixError.isSoftLogout.orFalse()))
+                }
             }
 
             return Failure.ServerError(matrixError, httpCode)