diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go
index ab859599607..1295f92e7dc 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server.go
@@ -159,7 +159,6 @@ func (s *server) createMetricReader(host component.Host) (metricsstore.Reader, e
 }
 
 func (s *server) makeQueryOptions() *queryApp.QueryOptions {
-	// TODO handle TLS
 	return &s.config.QueryOptions
 }
 
diff --git a/cmd/query/app/flags.go b/cmd/query/app/flags.go
index 05a0a9d1e97..01cb8ae2e5e 100644
--- a/cmd/query/app/flags.go
+++ b/cmd/query/app/flags.go
@@ -104,14 +104,12 @@ func (qOpts *QueryOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) (*Q
 	if err != nil {
 		return qOpts, fmt.Errorf("failed to process gRPC TLS options: %w", err)
 	}
-	otelTLSCfg := tlsGrpc.ToOtelServerConfig()
-	qOpts.GRPC.TLSSetting = otelTLSCfg
+	qOpts.GRPC.TLSSetting = tlsGrpc.ToOtelServerConfig()
 	tlsHTTP, err := tlsHTTPFlagsConfig.InitFromViper(v)
 	if err != nil {
 		return qOpts, fmt.Errorf("failed to process HTTP TLS options: %w", err)
 	}
-	otelHTTPCfg := tlsHTTP.ToOtelServerConfig()
-	qOpts.HTTP.TLSSetting = otelHTTPCfg
+	qOpts.HTTP.TLSSetting = tlsHTTP.ToOtelServerConfig()
 	qOpts.BasePath = v.GetString(queryBasePath)
 	qOpts.UIConfig.AssetsPath = v.GetString(queryStaticFiles)
 	qOpts.UIConfig.LogAccess = v.GetBool(queryLogStaticAssetsAccess)