diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index db397c3ddb9..f599d3f02e6 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -633,6 +633,7 @@ func RedactedValue(key, value string) string {
 		"CLIENT_SECRET",
 		"ENTERPRISE_LICENSE",
 		"API_DB_PASS",
+		"^TOKEN$",
 		"ID_FORWARDING_TOKEN$",
 		"AUTHENTICATION_TOKEN$",
 		"AUTH_TOKEN$",
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 0077bf27ef4..9a434a7e2ff 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -523,6 +523,12 @@ func TestRedactedValue(t *testing.T) {
 			value:    "test",
 			expected: RedactedPassword,
 		},
+		{
+			desc:     "client token",
+			key:      "token",
+			value:    "test",
+			expected: RedactedPassword,
+		},
 	}
 
 	for _, tc := range testCases {