diff --git a/src/expert-blame/expert-blame.service.ts b/src/expert-blame/expert-blame.service.ts
index 8c409db..d0f2073 100644
--- a/src/expert-blame/expert-blame.service.ts
+++ b/src/expert-blame/expert-blame.service.ts
@@ -770,7 +770,9 @@ export class ExpertBlameService {
           "",
       },
       needsFileReviewerCompletion:
-        String(doc.status ?? "") === CaseStatus.WAITING_FOR_FILE_REVIEWER,
+        String(doc.status ?? "") === CaseStatus.WAITING_FOR_FILE_REVIEWER ||
+        (!!(doc as any).isMadeByFileMaker &&
+          String(doc.status ?? "") === CaseStatus.WAITING_FOR_EXPERT),
     };
   }
 
diff --git a/src/expert-blame/expert-blame.v2.controller.ts b/src/expert-blame/expert-blame.v2.controller.ts
index ecf70ae..c0bd256 100644
--- a/src/expert-blame/expert-blame.v2.controller.ts
+++ b/src/expert-blame/expert-blame.v2.controller.ts
@@ -38,7 +38,7 @@ import { ResendRequestDto } from "./dto/resend.dto";
 @Controller("v2/expert-blame")
 @ApiBearerAuth()
 @UseGuards(LocalActorAuthGuard, RolesGuard)
-@Roles(RoleEnum.EXPERT, RoleEnum.FIELD_EXPERT, RoleEnum.FILE_REVIEWER, RoleEnum.FILE_MAKER)
+@Roles(RoleEnum.EXPERT, RoleEnum.FIELD_EXPERT)
 export class ExpertBlameV2Controller {
   constructor(private readonly expertBlameService: ExpertBlameService) {}
 
diff --git a/src/expert-claim/expert-claim.service.ts b/src/expert-claim/expert-claim.service.ts
index 6c4f8c9..72d780c 100644
--- a/src/expert-claim/expert-claim.service.ts
+++ b/src/expert-claim/expert-claim.service.ts
@@ -3891,7 +3891,7 @@ export class ExpertClaimService {
       blameIds.length > 0
         ? ((await this.blameRequestDbService.find(
             { _id: { $in: blameIds.map((id) => new Types.ObjectId(id)) } },
-            { lean: true, select: "type parties expert.decision blameStatus" },
+            { lean: true, select: "type parties expert.decision blameStatus status isMadeByFileMaker" },
           )) as any[])
         : [];
     const blameById = new Map<string, any>(
@@ -4027,7 +4027,9 @@ export class ExpertClaimService {
         createdAt: c.createdAt,
         awaitingFactorValidation: claimIsAwaitingExpertFactorValidationV2(c),
         needsFileReviewerCompletion:
-          String(blame?.status ?? "") === "WAITING_FOR_FILE_REVIEWER",
+          String(blame?.status ?? "") === "WAITING_FOR_FILE_REVIEWER" ||
+          (!!blame?.isMadeByFileMaker &&
+            String(blame?.status ?? "") === "WAITING_FOR_EXPERT"),
       };
     }) as ClaimListItemV2Dto[];
 
@@ -4140,7 +4142,9 @@ export class ExpertClaimService {
         createdAt: c.createdAt,
         awaitingFactorValidation: claimIsAwaitingExpertFactorValidationV2(c),
         needsFileReviewerCompletion:
-          String(blame?.status ?? "") === "WAITING_FOR_FILE_REVIEWER",
+          String(blame?.status ?? "") === "WAITING_FOR_FILE_REVIEWER" ||
+          (!!blame?.isMadeByFileMaker &&
+            String(blame?.status ?? "") === "WAITING_FOR_EXPERT"),
         assignedToMe: !!assignedToMe,
       };
     }) as ClaimListItemV2Dto[];
@@ -4212,7 +4216,9 @@ export class ExpertClaimService {
         createdAt: c.createdAt,
         awaitingFactorValidation: claimIsAwaitingExpertFactorValidationV2(c),
         needsFileReviewerCompletion:
-          String(blame?.status ?? "") === "WAITING_FOR_FILE_REVIEWER",
+          String(blame?.status ?? "") === "WAITING_FOR_FILE_REVIEWER" ||
+          (!!blame?.isMadeByFileMaker &&
+            String(blame?.status ?? "") === "WAITING_FOR_EXPERT"),
         assignedFileReviewerId: blame?.assignedFileReviewerId
           ? String(blame.assignedFileReviewerId)
           : undefined,