diff --git a/docs/identity_server.md b/docs/identity_server.md
index f272e5b485..04127c9ab0 100644
--- a/docs/identity_server.md
+++ b/docs/identity_server.md
@@ -25,7 +25,7 @@ Missing features (list not exhaustive):
 - Add email or phone to account (not P1, can be done on Riot-Web)
 - List email and phone of the account (could be done in a dedicated PR)
 - Search contact (not P1)
-- Logout from identity server when user sign out or deactivate his account (pending question in the issue).
+- Logout from identity server when user sign out or deactivate his account.
 
 ## Related MSCs
 The list can be found here: https://matrix.org/blog/2019/09/27/privacy-improvements-in-synapse-1-4-and-riot-1-4
@@ -69,8 +69,8 @@ The list can be found here: https://matrix.org/blog/2019/09/27/privacy-improveme
 - Look up pepper can be updated if it is rotated on the identity server
 - Invitation using 3PID can be done (See #548) (not done yet)
 - Homeserver access-token will never be sent to an identity server
-- When user sign-out: logout from the identity server if any?
-- When user deactivate account: logout from the identity server if any?
+- When user sign-out: logout from the identity server if any.
+- When user deactivate account: logout from the identity server if any.
 
 ## Screens
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
index 03086337ae..212db3f653 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -31,12 +31,4 @@ internal object HomeServerCapabilitiesMapper {
                 lastVersionIdentityServerSupported = entity.lastVersionIdentityServerSupported
         )
     }
-
-    fun map(domain: HomeServerCapabilities): HomeServerCapabilitiesEntity {
-        return HomeServerCapabilitiesEntity(
-                canChangePassword = domain.canChangePassword,
-                maxUploadFileSize = domain.maxUploadFileSize,
-                lastVersionIdentityServerSupported = domain.lastVersionIdentityServerSupported
-        )
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
index 6e7d4e5b32..bf8f9f272f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
@@ -49,18 +49,18 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
             return
         }
 
-        val uploadCapabilities = runCatching {
-            executeRequest<GetUploadCapabilitiesResult>(eventBus) {
-                apiCall = capabilitiesAPI.getUploadCapabilities()
-            }
-        }.getOrNull()
-
         val capabilities = runCatching {
             executeRequest<GetCapabilitiesResult>(eventBus) {
                 apiCall = capabilitiesAPI.getCapabilities()
             }
         }.getOrNull()
 
+        val uploadCapabilities = runCatching {
+            executeRequest<GetUploadCapabilitiesResult>(eventBus) {
+                apiCall = capabilitiesAPI.getUploadCapabilities()
+            }
+        }.getOrNull()
+
         val versions = runCatching {
             executeRequest<Versions>(null) {
                 apiCall = capabilitiesAPI.getVersions()