diff --git a/packages/emails/templates/attendee-request-email.ts b/packages/emails/templates/attendee-request-email.ts
index 027a004c10..4bdc21e82f 100644
--- a/packages/emails/templates/attendee-request-email.ts
+++ b/packages/emails/templates/attendee-request-email.ts
@@ -18,7 +18,7 @@ export default class AttendeeRequestEmail extends AttendeeScheduledEmail {
       to: toAddresses.join(","),
       subject: `${this.calEvent.organizer.language.translate("booking_submitted_subject", {
         eventType: this.calEvent.type,
-        name: this.calEvent.attendees[0].name,
+        name: this.calEvent.team?.name || this.calEvent.organizer.name,
         date: this.getFormattedDate(),
       })}`,
       html: renderEmail("AttendeeRequestEmail", {
diff --git a/packages/trpc/server/routers/viewer/bookings.tsx b/packages/trpc/server/routers/viewer/bookings.tsx
index f1d7b90e4d..145d8ebf51 100644
--- a/packages/trpc/server/routers/viewer/bookings.tsx
+++ b/packages/trpc/server/routers/viewer/bookings.tsx
@@ -441,6 +441,7 @@ export const bookingsRouter = createProtectedRouter()
             select: {
               id: true,
               recurringEvent: true,
+              title: true,
               requiresConfirmation: true,
               workflows: {
                 include: {
@@ -525,7 +526,7 @@ export const bookingsRouter = createProtectedRouter()
       const attendeesList = await Promise.all(attendeesListPromises);
 
       const evt: CalendarEvent = {
-        type: booking.title,
+        type: booking.eventType?.title || booking.title,
         title: booking.title,
         description: booking.description,
         customInputs: isPrismaObjOrUndefined(booking.customInputs),