3 files changed, 13 insertions, 5 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()
diff --git a/server/tests/api/check-params/video-editor.ts b/server/tests/api/check-params/video-editor.ts
index db284a3cc..1fd22c497 100644
--- a/server/tests/api/check-params/video-editor.ts
+++ b/server/tests/api/check-params/video-editor.ts
@@ -122,10 +122,11 @@ describe('Test video editor API validator', function () {
       })
 
       it('Should fail with an already in transcoding state video', async function () {
-        await server.jobs.pauseJobQueue()
-
         const { uuid } = await server.videos.quickUpload({ name: 'transcoded video' })
 
+        await server.jobs.pauseJobQueue()
+        await server.videos.runTranscoding({ videoId: uuid, transcodingType: 'hls' })
+
         await command.createEditionTasks({
           videoId: uuid,
           tasks: VideoEditorCommand.getComplexTask(),
diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index bd8ffe188..6cc88a123 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -12,6 +12,7 @@ import {
   waitJobs
 } from '@shared/server-commands'
 import { wait } from '@shared/core-utils'
+import { uuid } from 'short-uuid'
 
 const expect = chai.expect
 
@@ -95,14 +96,16 @@ describe('Test jobs', function () {
   it('Should pause the job queue', async function () {
     this.timeout(120000)
 
-    await servers[1].jobs.pauseJobQueue()
+    const { uuid } = await servers[1].videos.upload({ attributes: { name: 'video2' } })
+    await waitJobs(servers)
 
-    await servers[1].videos.upload({ attributes: { name: 'video2' } })
+    await servers[1].jobs.pauseJobQueue()
+    await servers[1].videos.runTranscoding({ videoId: uuid, transcodingType: 'hls' })
 
     await wait(5000)
 
     const body = await servers[1].jobs.list({ state: 'waiting', jobType: 'video-transcoding' })
-    expect(body.data).to.have.lengthOf(1)
+    expect(body.data).to.have.lengthOf(4)
   })
 
   it('Should resume the job queue', async function () {