diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index 727de4991d..e4d1bf749d 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -184,9 +184,9 @@
     "duplicateWave": "The migration wave could not be created due to a conflict with an existing wave. Make sure the name and start/end dates are unique and try again.",
     "importErrorCheckDocumentation": "For status Error imports, check the documentation to ensure your file is structured correctly.",
     "insecureTracker": "Insecure mode deactivates certificate verification. Use insecure mode for instances that have self-signed certificates.",
-    "inheritedReviewTooltip_singular": "This application is inheriting a review from an archetype.",
+    "inheritedReviewTooltip": "This application is inheriting a review from an archetype.",
     "inheritedReviewTooltip_plural": "This application is inheriting reviews from {{count}} archetypes.",
-    "inheritedAssessmentTooltip_singular": "This application is inheriting an assessment from an archetype.",
+    "inheritedAssessmentTooltip": "This application is inheriting an assessment from an archetype.",
     "inheritedAssessmentTooltip_plural": "This application is inheriting assessments from {{count}} archetypes.",
     "jiraInstanceNotConnected": "Jira instance {{name}} is not connected.",
     "manageDependenciesInstructions": "Add northbound and southbound dependencies for the selected application here. Note that any selections made will be saved automatically. To undo any changes, you must manually delete the applications from the dropdowns.",
diff --git a/client/src/app/pages/applications/components/application-assessment-status/application-assessment-status.tsx b/client/src/app/pages/applications/components/application-assessment-status/application-assessment-status.tsx
index 8a1ee287f4..6bb9122a6a 100644
--- a/client/src/app/pages/applications/components/application-assessment-status/application-assessment-status.tsx
+++ b/client/src/app/pages/applications/components/application-assessment-status/application-assessment-status.tsx
@@ -42,17 +42,16 @@ export const ApplicationAssessmentStatus: React.FC<
 
   let statusPreset: IconedStatusPreset = "NotStarted"; // Default status
   let tooltipCount: number = 0;
-
   const isDirectlyAssessed =
     application.assessed && (application.assessments?.length ?? 0) > 0;
-
   if (isDirectlyAssessed) {
     statusPreset = "Completed";
   } else if (hasAssessedArchetype) {
     statusPreset = "InheritedAssessments";
     const assessedArchetypeCount =
-      applicationArchetypes?.filter((archetype) => !!archetype?.assessments)
-        .length || 0;
+      applicationArchetypes?.filter(
+        (archetype) => archetype?.assessments?.length ?? 0 > 0
+      ).length || 0;
     tooltipCount = assessedArchetypeCount;
   } else if (
     assessments?.some(