diff --git a/apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx b/apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx
index c52711b2..87411138 100644
--- a/apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx
+++ b/apps/web/src/app/[orgShortcode]/convo/_components/convo-list-item.tsx
@@ -84,7 +84,8 @@ export const ConvoItem = memo(function ConvoItem({
     const author = allParticipants.find(
       (participant) =>
         participant.participantPublicId === authorAsParticipant?.publicId
-    )!;
+    );
+    if (!author) return participantsWithoutAuthor;
     return [author].concat(participantsWithoutAuthor);
   }, [convo.participants, authorAsParticipant]);
 
diff --git a/apps/web/src/app/[orgShortcode]/convo/utils.ts b/apps/web/src/app/[orgShortcode]/convo/utils.ts
index e78997f8..3ad043ae 100644
--- a/apps/web/src/app/[orgShortcode]/convo/utils.ts
+++ b/apps/web/src/app/[orgShortcode]/convo/utils.ts
@@ -19,6 +19,7 @@ type InfiniteConvoListUpdater = InfiniteData<
 export function formatParticipantData(
   participant: Convo['participants'][number]
 ) {
+  if (!participant) return null;
   const typePublicId =
     participant.orgMember?.publicId ??
     participant.team?.publicId ??