Merge branch 'release-v1.45' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/config/saml2.py b/synapse/config/saml2.py

index 05e983625d..9c51b6a25a 100644
--- a/synapse/config/saml2.py
+++ b/synapse/config/saml2.py
@@ -199,7 +199,7 @@ class SAML2Config(Config):
         """
         import saml2
 
-        public_baseurl = self.public_baseurl
+        public_baseurl = self.root.server.public_baseurl
         if public_baseurl is None:
             raise ConfigError("saml2_config requires a public_baseurl to be set")