diff --git a/pkg/cmd/server/defaults.go b/pkg/cmd/server/defaults.go
index 3d25fda5f2..455d79ad26 100644
--- a/pkg/cmd/server/defaults.go
+++ b/pkg/cmd/server/defaults.go
@@ -125,6 +125,12 @@ var defaultGRPCLogOptions = []grpclog.Option{
 	grpclog.WithDurationField(func(duration time.Duration) grpclog.Fields {
 		return grpclog.Fields{"grpc.time_ms", duration.Milliseconds()}
 	}),
+	grpclog.WithFieldsFromContext(func(ctx context.Context) grpclog.Fields {
+		if span := trace.SpanContextFromContext(ctx); span.IsSampled() {
+			return grpclog.Fields{"traceID", span.TraceID().String()}
+		}
+		return nil
+	}),
 }
 
 const (