1 files changed, 4 insertions, 0 deletions

diff --git a/server/lib/job-queue/handlers/manage-video-torrent.ts b/server/lib/job-queue/handlers/manage-video-torrent.ts
index 5cb4287e1..dfd4e6140 100644
--- a/server/lib/job-queue/handlers/manage-video-torrent.ts
+++ b/server/lib/job-queue/handlers/manage-video-torrent.ts
@@ -28,6 +28,8 @@ async function doCreateAction (payload: ManageVideoTorrentPayload & { action: 'c
     loadFileOrLog(payload.videoFileId)
   ])
 
+  if (!video || !file) return
+
   await createTorrentAndSetInfoHash(video, file)
 
   // Refresh videoFile because the createTorrentAndSetInfoHash could be long
@@ -48,6 +50,8 @@ async function doUpdateMetadataAction (payload: ManageVideoTorrentPayload & { ac
     loadFileOrLog(payload.videoFileId)
   ])
 
+  if ((!video && !streamingPlaylist) || !file) return
+
   await updateTorrentMetadata(video || streamingPlaylist, file)
 
   await file.save()