1 files changed, 2 insertions, 0 deletions

diff --git a/server/models/video/tag.ts b/server/models/video/tag.ts
index 0ae74d808..6d79a5575 100644
--- a/server/models/video/tag.ts
+++ b/server/models/video/tag.ts
@@ -37,6 +37,8 @@ export class TagModel extends Model<TagModel> {
   Videos: VideoModel[]
 
   static findOrCreateTags (tags: string[], transaction: Transaction) {
+    if (tags === null) return []
+
     const tasks: Bluebird<TagModel>[] = []
     tags.forEach(tag => {
       const query = {