diff --git a/cmd/query/app/flags.go b/cmd/query/app/flags.go
index fc204e88bee..bc8fd7fe9d3 100644
--- a/cmd/query/app/flags.go
+++ b/cmd/query/app/flags.go
@@ -18,6 +18,7 @@ import (
 	"github.com/spf13/viper"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
+	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configopaque"
 	"go.uber.org/zap"
 
@@ -100,8 +101,11 @@ func AddFlags(flagSet *flag.FlagSet) {
 func (qOpts *QueryOptions) InitFromViper(v *viper.Viper, logger *zap.Logger) (*QueryOptions, error) {
 	qOpts.HTTP.Endpoint = v.GetString(queryHTTPHostPort)
 	qOpts.GRPC.NetAddr.Endpoint = v.GetString(queryGRPCHostPort)
+	qOpts.GRPC.NetAddr.Transport = confignet.TransportTypeTCP
+	// TODO: drop support for same host ports
+	// https://github.com/jaegertracing/jaeger/issues/6117
 	if qOpts.HTTP.Endpoint == qOpts.GRPC.NetAddr.Endpoint {
-		logger.Warn("using the same port for gRPC and HTTP is deprecated; please use dedicated ports instead")
+		logger.Warn("using the same port for gRPC and HTTP is deprecated; please use dedicated ports instead; Support for shared port will be removed in Feb 2025")
 	}
 	tlsGrpc, err := tlsGRPCFlagsConfig.InitFromViper(v)
 	if err != nil {
diff --git a/cmd/query/app/flags_test.go b/cmd/query/app/flags_test.go
index c0a460f89e4..688020e164e 100644
--- a/cmd/query/app/flags_test.go
+++ b/cmd/query/app/flags_test.go
@@ -198,6 +198,6 @@ func TestQueryOptions_SamePortsLogsWarning(t *testing.T) {
 	require.Contains(
 		t,
 		logBuf.String(),
-		"using the same port for gRPC and HTTP is deprecated; please use dedicated ports instead",
+		"using the same port for gRPC and HTTP is deprecated",
 	)
 }
diff --git a/cmd/query/app/server.go b/cmd/query/app/server.go
index 72beb819443..bed1f15e305 100644
--- a/cmd/query/app/server.go
+++ b/cmd/query/app/server.go
@@ -90,7 +90,7 @@ func NewServer(
 	if err != nil {
 		return nil, err
 	}
-	registerGRPCServer(grpcServer, querySvc, metricsQuerySvc, telset)
+	registerGRPCHandlers(grpcServer, querySvc, metricsQuerySvc, telset)
 
 	httpServer, err := createHTTPServer(ctx, querySvc, metricsQuerySvc, options, tm, telset)
 	if err != nil {
@@ -136,7 +136,7 @@ func createGRPCServerLegacy(
 	return server, nil
 }
 
-func registerGRPCServer(
+func registerGRPCHandlers(
 	server *grpc.Server,
 	querySvc *querysvc.QueryService,
 	metricsQuerySvc querysvc.MetricsQueryService,