1 files changed, 7 insertions, 3 deletions

diff --git a/server/lib/activitypub/video-comments.ts b/server/lib/activitypub/video-comments.ts
index 776a295c0..902d877c4 100644
--- a/server/lib/activitypub/video-comments.ts
+++ b/server/lib/activitypub/video-comments.ts
@@ -28,14 +28,18 @@ async function resolveThread (params: ResolveThreadParams): ResolveThreadResult
   if (params.commentCreated === undefined) params.commentCreated = false
   if (params.comments === undefined) params.comments = []
 
-  // Already have this comment?
-  if (isVideo === false) {
+  // If it is not a video, or if we don't know if it's a video
+  if (isVideo === false || isVideo === undefined) {
     const result = await resolveCommentFromDB(params)
     if (result) return result
   }
 
   try {
-    if (isVideo === true) return tryResolveThreadFromVideo(params)
+    // If it is a video, or if we don't know if it's a video
+    if (isVideo === true || isVideo === undefined) {
+      // Keep await so we catch the exception
+      return await tryResolveThreadFromVideo(params)
+    }
   } catch (err) {
     logger.debug('Cannot get or create account and video and channel for reply %s, fetch comment', url, { err })
   }