diff --git a/ElementX/Sources/Services/UserSession/UserSessionStore.swift b/ElementX/Sources/Services/UserSession/UserSessionStore.swift
index 39fcfa54d..023638ef3 100644
--- a/ElementX/Sources/Services/UserSession/UserSessionStore.swift
+++ b/ElementX/Sources/Services/UserSession/UserSessionStore.swift
@@ -142,7 +142,6 @@ class UserSessionStore: UserSessionStoreProtocol {
                     .passphrase(passphrase: credentials.restorationToken.passphrase))
             .withSearchIndexStore(path: credentials.restorationToken.sessionDirectories.dataPath,
                                   password: credentials.restorationToken.passphrase)
-            .serverNameFromUserId(userId: credentials.userID)
             .homeserverUrl(url: homeserverURL)
         
         do {
diff --git a/NSE/Sources/NSEUserSession.swift b/NSE/Sources/NSEUserSession.swift
index 489eacb19..d2f4c19e3 100644
--- a/NSE/Sources/NSEUserSession.swift
+++ b/NSE/Sources/NSEUserSession.swift
@@ -75,7 +75,6 @@ final nonisolated class NSEUserSession: NSEUserSessionProtocol {
             .sqliteStore(config: .init(dataPath: credentials.restorationToken.sessionDirectories.dataPath,
                                        cachePath: credentials.restorationToken.sessionDirectories.cachePath)
                     .passphrase(passphrase: credentials.restorationToken.passphrase))
-            .serverNameFromUserId(userId: credentials.userID)
             .homeserverUrl(url: homeserverURL)
         
         baseClient = try await clientBuilder.build()