diff --git a/client/src/app/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx b/client/src/app/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx index 9ef0175551..2f4360b8da 100644 --- a/client/src/app/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx +++ b/client/src/app/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx @@ -40,6 +40,12 @@ const AssessmentActionsTable: React.FC = ({ nonRequiredQuestionnaireIds.includes(assessment.questionnaire.id) && relevantAssessmentIds.includes(assessment.id) ); + const filteredArchivedQuestionnaires = archivedQuestionnaires.filter( + (questionnaire) => + filteredArchivedAssessments.some( + (assessment) => assessment.questionnaire.id === questionnaire.id + ) + ); return ( <> @@ -56,7 +62,7 @@ const AssessmentActionsTable: React.FC = ({ application={application} archetype={archetype} isReadonly - questionnaires={archivedQuestionnaires} + questionnaires={filteredArchivedQuestionnaires} assessments={filteredArchivedAssessments} isFetching={isFetchingQuestionnaires || isFetchingAssessmentsById} tableName="Archived questionnaires"