diff --git a/pkg/query-service/utils/format.go b/pkg/query-service/utils/format.go
index 77435222881f..2b6fbcbe760f 100644
--- a/pkg/query-service/utils/format.go
+++ b/pkg/query-service/utils/format.go
@@ -245,8 +245,8 @@ func ClickHouseFormattedMetricNames(v interface{}) string {
 }
 
 func AddBackTickToFormatTag(str string) string {
-	if strings.Contains(str, ".") {
-		return "`" + str + "`"
+	if strings.Contains(str, ".") || strings.Contains(str, "-") {
+		if strings.HasPrefix(str, "`") && strings.HasSuffix(str, "`") { return str } else { return "`" + str + "`" }
 	} else {
 		return str
 	}