diff --git a/frontend/src/components/guests/guests-list.tsx b/frontend/src/components/guests/guests-list.tsx
index 1492a78..27d11eb 100644
--- a/frontend/src/components/guests/guests-list.tsx
+++ b/frontend/src/components/guests/guests-list.tsx
@@ -578,8 +578,8 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
 
                   {/* Dietary Restrictions Column */}
                   <TableCell>
-                    {guest.dietary_restrictions &&
-                    guest.dietary_restrictions.length > 0 ? (
+                    {guest.rsvp?.dietary_requirements &&
+                    guest.rsvp.dietary_requirements.length > 0 ? (
                       <Popover>
                         <PopoverTrigger asChild>
                           <Button
@@ -592,7 +592,7 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
                         </PopoverTrigger>
                         <PopoverContent className="max-w-xs">
                           <p className="text-sm">
-                            {guest.dietary_restrictions}
+                            {guest.rsvp.dietary_requirements}
                           </p>
                         </PopoverContent>
                       </Popover>
@@ -603,7 +603,8 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
 
                   {/* Notes Column */}
                   <TableCell>
-                    {guest.notes && guest.notes.length > 0 ? (
+                    {guest.rsvp?.response_message &&
+                    guest.rsvp.response_message.length > 0 ? (
                       <Popover>
                         <PopoverTrigger asChild>
                           <Button
@@ -615,7 +616,9 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
                           </Button>
                         </PopoverTrigger>
                         <PopoverContent className="max-w-xs">
-                          <p className="text-sm">{guest.notes}</p>
+                          <p className="text-sm">
+                            {guest.rsvp.response_message}
+                          </p>
                         </PopoverContent>
                       </Popover>
                     ) : (