diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
index c6a9cadf9cf50c2110690692f320b432b688a84a..e3728753adc6d9cea7003861ff88d6068bed0d7b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
@@ -58,6 +58,6 @@ data class Credentials(
         @Json(name = "well_known") val discoveryInformation: DiscoveryInformation? = null
 )
 
-fun Credentials.sessionId(): String {
+internal fun Credentials.sessionId(): String {
     return (if (deviceId.isNullOrBlank()) userId else "$userId|$deviceId").md5()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 050aa8c5709dd5983515e07e7b55159b0e50e67b..f947b44e17a8e9bebba898a651ed1864ee412695 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -495,6 +495,6 @@ internal class DefaultAuthenticationService @Inject constructor(
 
     //Added for switch user
     override fun removeSession(sessionId: String) {
-        sessionManager.releaseSession(sessionId)
+        sessionManager.removeSession(sessionId)
     }
 }