2 files changed, 22 insertions, 2 deletions

diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts
index 27b1b7160..9a7dacba0 100644
--- a/server/controllers/lazy-static.ts
+++ b/server/controllers/lazy-static.ts
@@ -48,7 +48,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function getActorImage (req: express.Request, res: express.Response) {
+async function getActorImage (req: express.Request, res: express.Response, next: express.NextFunction) {
   const filename = req.params.filename
 
   if (actorImagePathUnsafeCache.has(filename)) {
@@ -78,7 +78,23 @@ async function getActorImage (req: express.Request, res: express.Response) {
   const path = image.getPath()
 
   actorImagePathUnsafeCache.set(filename, path)
-  return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER })
+
+  return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }, (err: any) => {
+    if (!err) return
+
+    // It seems this actor image is not on the disk anymore
+    if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) {
+      logger.error('Cannot lazy serve actor image %s.', filename, { err })
+
+      actorImagePathUnsafeCache.del(filename)
+
+      image.onDisk = false
+      image.save()
+       .catch(err => logger.error('Cannot save new actor image disk state.', { err }))
+    }
+
+    return next(err)
+  })
 }
 
 async function getPreview (req: express.Request, res: express.Response) {
diff --git a/server/models/actor/actor-image.ts b/server/models/actor/actor-image.ts
index a35f9edb0..98a7f6fba 100644
--- a/server/models/actor/actor-image.ts
+++ b/server/models/actor/actor-image.ts
@@ -98,4 +98,8 @@ export class ActorImageModel extends Model<Partial<AttributesOnly<ActorImageMode
     const imagePath = join(CONFIG.STORAGE.ACTOR_IMAGES, this.filename)
     return remove(imagePath)
   }
+
+  isOwned () {
+    return !this.fileUrl
+  }
 }