2 files changed, 23 insertions, 3 deletions

diff --git a/server/models/video/sql/video/shared/video-model-builder.ts b/server/models/video/sql/video/shared/video-model-builder.ts
index b1b47b721..166ff9d31 100644
--- a/server/models/video/sql/video/shared/video-model-builder.ts
+++ b/server/models/video/sql/video/shared/video-model-builder.ts
@@ -234,15 +234,17 @@ export class VideoModelBuilder {
   }
 
   private addActorAvatar (row: SQLRow, actorPrefix: string, actor: ActorModel) {
-    const avatarPrefix = `${actorPrefix}.Avatar`
+    const avatarPrefix = `${actorPrefix}.Avatars`
     const id = row[`${avatarPrefix}.id`]
-    if (!id || this.actorImagesDone.has(id)) return
+    const key = `${row.id}${id}`
+
+    if (!id || this.actorImagesDone.has(key)) return
 
     const attributes = this.grab(row, this.tables.getAvatarAttributes(), avatarPrefix)
     const avatarModel = new ActorImageModel(attributes, this.buildOpts)
     actor.Avatars.push(avatarModel)
 
-    this.actorImagesDone.add(id)
+    this.actorImagesDone.add(key)
   }
 
   private addThumbnail (row: SQLRow, videoModel: VideoModel) {
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index 5bbc60559..2a49fd360 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -2,6 +2,7 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { and } from 'sequelize/dist'
 import request from 'supertest'
 import {
   checkTmpIsEmpty,
@@ -17,6 +18,7 @@ import {
   cleanupTests,
   createMultipleServers,
   doubleFollow,
+  makeGetRequest,
   PeerTubeServer,
   setAccessTokensToServers,
   setDefaultAccountAvatar,
@@ -138,6 +140,22 @@ describe('Test multiple servers', function () {
 
         await completeVideoCheck(server, video, checkAttributes)
         publishedAt = video.publishedAt as string
+
+        expect(video.channel.avatars).to.have.lengthOf(2)
+        expect(video.account.avatars).to.have.lengthOf(2)
+
+        for (const image of [ ...video.channel.avatars, ...video.account.avatars ]) {
+          expect(image.createdAt).to.exist
+          expect(image.updatedAt).to.exist
+          expect(image.width).to.be.above(20).and.below(1000)
+          expect(image.path).to.exist
+
+          await makeGetRequest({
+            url: server.url,
+            path: image.path,
+            expectedStatus: HttpStatusCode.OK_200
+          })
+        }
       }
     })