diff --git a/apps/edr-passenger-api/prisma/schema.prisma b/apps/edr-passenger-api/prisma/schema.prisma
index b00408215..8a4224e73 100644
--- a/apps/edr-passenger-api/prisma/schema.prisma
+++ b/apps/edr-passenger-api/prisma/schema.prisma
@@ -883,7 +883,11 @@ model FaqArticle {
 
 model SupportConversation {
   id                 String                    @id @default(uuid())
-  userId             String
+  userId             String?
+  guestId            String?
+  guestName          String?
+  guestEmail         String?
+  guestPhone         String?
   passengerId        String?
   passengerName      String?
   subject            String?
@@ -899,6 +903,7 @@ model SupportConversation {
   messages           SupportMessage[]
   passenger          Passenger?                @relation(fields: [passengerId], references: [id])
   @@index([userId])
+  @@index([guestId])
   @@index([status, lastMessageAt])
   @@schema("passenger")
 }