diff --git a/pkg/services/ssosettings/strategies/saml_strategy.go b/pkg/services/ssosettings/strategies/saml_strategy.go
index 3a963674066..fa37bb6b46b 100644
--- a/pkg/services/ssosettings/strategies/saml_strategy.go
+++ b/pkg/services/ssosettings/strategies/saml_strategy.go
@@ -56,12 +56,13 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any {
 		"assertion_attribute_org":    section.KeyValue("assertion_attribute_org").MustString(""),
 		"allowed_organizations":      section.KeyValue("allowed_organizations").MustString(""),
 		"org_mapping":                section.KeyValue("org_mapping").MustString(""),
+		"role_values_none":           section.KeyValue("role_values_none").MustString(""),
+		"role_values_viewer":         section.KeyValue("role_values_viewer").MustString(""),
 		"role_values_editor":         section.KeyValue("role_values_editor").MustString(""),
 		"role_values_admin":          section.KeyValue("role_values_admin").MustString(""),
 		"role_values_grafana_admin":  section.KeyValue("role_values_grafana_admin").MustString(""),
 		"name_id_format":             section.KeyValue("name_id_format").MustString(""),
 		"skip_org_role_sync":         section.KeyValue("skip_org_role_sync").MustBool(false),
-		"role_values_none":           section.KeyValue("role_values_none").MustString(""),
 	}
 	return result
 }
diff --git a/pkg/services/ssosettings/strategies/saml_strategy_test.go b/pkg/services/ssosettings/strategies/saml_strategy_test.go
index 974561949c6..489a3f1e7a7 100644
--- a/pkg/services/ssosettings/strategies/saml_strategy_test.go
+++ b/pkg/services/ssosettings/strategies/saml_strategy_test.go
@@ -38,6 +38,7 @@ var (
 	assertion_attribute_org = orgs
 	allowed_organizations = org1 org2
 	org_mapping = org1:1:editor, *:2:viewer
+	role_values_viewer = viewer
 	role_values_editor = editor
 	role_values_admin = admin
 	role_values_grafana_admin = serveradmin
@@ -71,6 +72,7 @@ var (
 		"assertion_attribute_org":    "orgs",
 		"allowed_organizations":      "org1 org2",
 		"org_mapping":                "org1:1:editor, *:2:viewer",
+		"role_values_viewer":         "viewer",
 		"role_values_editor":         "editor",
 		"role_values_admin":          "admin",
 		"role_values_grafana_admin":  "serveradmin",