1 files changed, 6 insertions, 2 deletions

diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts
index 79aa547ba..7607267f8 100644
--- a/server/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/lib/job-queue/handlers/video-live-ending.ts
@@ -244,6 +244,10 @@ async function cleanupLiveAndFederate (options: {
     await cleanupNormalLive(video, streamingPlaylist)
   }
 
-  const fullVideo = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.id)
-  return federateVideoIfNeeded(fullVideo, false, undefined)
+  try {
+    const fullVideo = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.id)
+    return federateVideoIfNeeded(fullVideo, false, undefined)
+  } catch (err) {
+    logger.warn('Cannot federate live after cleanup', { videoId: video.id, err })
+  }
 }