diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe8c57a51d1..3056dd49806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## main / unreleased
 
+* [ENHANCEMENT] tempo-query: separate tls settings for server and client [#4177](https://github.com/grafana/tempo/pull/4177) (@frzifus)
 * [ENHANCEMENT] Pushdown collection of results from generators in the querier [#4119](https://github.com/grafana/tempo/pull/4119) (@electron0zero)
 * [ENHANCEMENT] Send semver version in api/stattus/buildinfo for cloud deployments [#4110](https://github.com/grafana/tempo/pull/4110) [@Aki0x137]
 * [ENHANCEMENT] Speedup tempo-query trace search by allowing parallel queries [#4159](https://github.com/grafana/tempo/pull/4159) (@pavolloffay)
diff --git a/cmd/tempo-query/tempo/config.go b/cmd/tempo-query/tempo/config.go
index cdbf3e944a0..fc3e387fd3b 100644
--- a/cmd/tempo-query/tempo/config.go
+++ b/cmd/tempo-query/tempo/config.go
@@ -8,9 +8,11 @@ import (
 
 // Config holds the configuration for redbull.
 type Config struct {
-	Address               string           `yaml:"address"`
-	Backend               string           `yaml:"backend"`
-	TLSEnabled            bool             `yaml:"tls_enabled" category:"advanced"`
+	Address string `yaml:"address"`
+	Backend string `yaml:"backend"`
+	// TLSEnabled enables tls outgoing requests from tempo-query to tempo.
+	TLSEnabled bool `yaml:"tls_enabled" category:"advanced"`
+	// TLSServerEnabeld enables tls for incoming requests to the tempo-query API.
 	TLSServerEnabeld      bool             `yaml:"tls_server_enabled" category:"advanced"`
 	TLS                   tls.ClientConfig `yaml:",inline"`
 	TenantHeaderKey       string           `yaml:"tenant_header_key"`