diff --git a/packages/server-commands/src/server/object-storage-command.ts b/packages/server-commands/src/server/object-storage-command.ts
index 37aeb109b..f5c199769 100644
--- a/packages/server-commands/src/server/object-storage-command.ts
+++ b/packages/server-commands/src/server/object-storage-command.ts
@@ -183,7 +183,8 @@ export class ObjectStorageCommand {
 
         streaming_playlists: {
           bucket_name: this.DEFAULT_SCALEWAY_BUCKET,
-          prefix: `test:server-${serverNumber}-streaming-playlists:`
+          prefix: `test:server-${serverNumber}-streaming-playlists:`,
+          store_live_streams: true
         },
 
         web_videos: {
diff --git a/server/core/models/video/video-comment.ts b/server/core/models/video/video-comment.ts
index c9da6c457..9b8e20529 100644
--- a/server/core/models/video/video-comment.ts
+++ b/server/core/models/video/video-comment.ts
@@ -251,6 +251,7 @@ export class VideoCommentModel extends SequelizeModel<VideoCommentModel> {
       await retryTransactionWrapper(() => {
         return sequelizeTypescript.transaction(async transaction => {
           const video = await VideoModel.load(videoId, transaction)
+          if (!video) return
 
           video.comments = await new VideoCommentListQueryBuilder(VideoCommentModel.sequelize, {
             selectType: 'comment-only',
diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.ts
index 362fea2ca..953e5aa2a 100644
--- a/server/core/models/video/video.ts
+++ b/server/core/models/video/video.ts
@@ -846,7 +846,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {
   static async removeFiles (instance: VideoModel, options) {
     const tasks: Promise<any>[] = []
 
-    logger.info('Removing files of video %s.', instance.url, { toto: new Error().stack })
+    logger.info('Removing files of video ' + instance.url)
 
     if (instance.isOwned()) {
       if (!Array.isArray(instance.VideoFiles)) {