diff --git a/CHANGES.rst b/CHANGES.rst
index 2f2bf111c9..f79a5ff3c4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,6 +14,7 @@ Changes to be released in next version
  * Voice messages: Remove labs setting and enable them by default
  * Room: Remove the green border from direct message room avatars (#4520).
  * VoIP: Additional changes on call tiles (#4642).
+ * SSO: Stable ids for MSC 2858 (#4362).
 
 🐛 Bugfix
  * 
diff --git a/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift b/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift
index d00094b85d..1ede12851e 100644
--- a/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift
+++ b/Riot/Modules/Authentication/SSO/SSOAuthenticationService.swift
@@ -48,12 +48,10 @@ final class SSOAuthenticationService: NSObject {
             return nil
         }
         
-        let ssoRedirectPath: String
+        var ssoRedirectPath = SSOURLConstants.Paths.redirect
         
         if let identityProvider = identityProvider {
-            ssoRedirectPath = SSOURLConstants.Paths.unstableRedirect + identityProvider
-        } else {
-            ssoRedirectPath = SSOURLConstants.Paths.redirect
+            ssoRedirectPath.append(identityProvider)
         }
         
         authenticationComponent.path = ssoRedirectPath
diff --git a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift
index 01de2ddc90..791987bfce 100644
--- a/Riot/Modules/Authentication/SSO/SSOURLConstants.swift
+++ b/Riot/Modules/Authentication/SSO/SSOURLConstants.swift
@@ -24,7 +24,6 @@ enum SSOURLConstants {
     }
     
     enum Paths {
-        static let redirect = "/_matrix/client/r0/login/sso/redirect"
-        static let unstableRedirect = "/_matrix/client/unstable/org.matrix.msc2858/login/sso/redirect/"
+        static let redirect = "/_matrix/client/r0/login/sso/redirect/"
     }
 }