diff --git a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
index 07b8e402ea5..48cb75e8d32 100644
--- a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
@@ -24,7 +24,9 @@ const summarizeTeamPrompt = async (meeting: TeamPromptMeeting, context: Internal
   const r = await getRethink()
 
   const summary = await generateStandupMeetingSummary(meeting, dataLoader)
-  await pg.updateTable('NewMeeting').set({summary}).where('id', '=', meeting.id).execute()
+  if (summary) {
+    await pg.updateTable('NewMeeting').set({summary}).where('id', '=', meeting.id).execute()
+  }
   await r
     .table('NewMeeting')
     .get(meeting.id)
diff --git a/packages/server/graphql/public/types/MeetingSeries.ts b/packages/server/graphql/public/types/MeetingSeries.ts
index 5812ed6e566..eaf99efdb83 100644
--- a/packages/server/graphql/public/types/MeetingSeries.ts
+++ b/packages/server/graphql/public/types/MeetingSeries.ts
@@ -7,7 +7,8 @@ const MeetingSeries: MeetingSeriesResolvers = {
     return MeetingSeriesId.join(id)
   },
   activeMeetings: async (meetingSeries, _args, {dataLoader}) => {
-    return dataLoader.get('activeMeetingsByMeetingSeriesId').load(meetingSeries.id)
+    const res = await dataLoader.get('activeMeetingsByMeetingSeriesId').load(meetingSeries.id)
+    return res || []
   },
   mostRecentMeeting: async ({id: meetingSeriesId}, _args, _context) => {
     const r = await getRethink()