diff --git a/pkg/services/ssosettings/strategies/saml_strategy.go b/pkg/services/ssosettings/strategies/saml_strategy.go
index 740d86ee2c0..026fd5cef7f 100644
--- a/pkg/services/ssosettings/strategies/saml_strategy.go
+++ b/pkg/services/ssosettings/strategies/saml_strategy.go
@@ -33,6 +33,7 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
 	section := s.settingsProvider.Section("auth.saml")
 	result := map[string]any{
 		"enabled":                    section.KeyValue("enabled").MustBool(false),
+		"entity_id":                  section.KeyValue("entity_id").MustString(""),
 		"name":                       section.KeyValue("name").MustString("SAML"),
 		"single_logout":              section.KeyValue("single_logout").MustBool(false),
 		"allow_sign_up":              section.KeyValue("allow_sign_up").MustBool(false),
diff --git a/pkg/services/ssosettings/strategies/saml_strategy_test.go b/pkg/services/ssosettings/strategies/saml_strategy_test.go
index d076f708400..c04ef280318 100644
--- a/pkg/services/ssosettings/strategies/saml_strategy_test.go
+++ b/pkg/services/ssosettings/strategies/saml_strategy_test.go
@@ -15,6 +15,7 @@ var (
 	iniSAMLContent = `
 	[auth.saml]
 	enabled = true
+	entity_id = custom-entity-id
 	single_logout = true
 	name = "SAML Test"
 	allow_sign_up = true
@@ -54,6 +55,7 @@ var (
 
 	expectedSAMLInfo = map[string]any{
 		"enabled":                    true,
+		"entity_id":                  "custom-entity-id",
 		"single_logout":              true,
 		"allow_sign_up":              true,
 		"auto_login":                 true,