diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 4cbf43e0eb7..bc26b0f7263 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -599,6 +599,13 @@ func RedactedValue(key, value string) string {
 		"CLIENT_SECRET",
 		"ENTERPRISE_LICENSE",
 		"GF_ENTITY_API_DB_PASS",
+		"ID_FORWARDING_TOKEN$",
+		"AUTHENTICATION_TOKEN$",
+		"AUTH_TOKEN$",
+		"RENDERER_TOKEN$",
+		"API_TOKEN$",
+		"WEBHOOK_TOKEN$",
+		"INSTALL_TOKEN$",
 	} {
 		if match, err := regexp.MatchString(pattern, uppercased); match && err == nil {
 			return RedactedPassword
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 57bce42da71..b112bd3130a 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -528,6 +528,12 @@ func TestRedactedValue(t *testing.T) {
 			value:    "",
 			expected: "",
 		},
+		{
+			desc:     "authentication_token",
+			key:      "my_authentication_token",
+			value:    "test",
+			expected: RedactedPassword,
+		},
 	}
 
 	for _, tc := range testCases {