diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts
index 97db491823c..c275ad8c355 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts
@@ -76,12 +76,9 @@ export class AllActivitiesService {
   }
 
   setAllAppsReportDetails(applications: ApplicationHealthReportDetailEnriched[]) {
-    // Only count at-risk passwords for CRITICAL applications
-    const criticalApps = applications.filter((app) => app.isMarkedAsCritical);
-    const totalAtRiskPasswords = criticalApps.reduce(
-      (sum, app) => sum + app.atRiskPasswordCount,
-      0,
-    );
+    const totalAtRiskPasswords = applications
+      .filter((app) => app.isMarkedAsCritical)
+      .reduce((sum, app) => sum + app.atRiskPasswordCount, 0);
     this.atRiskPasswordsCountSubject$.next(totalAtRiskPasswords);
 
     this.allApplicationsDetailsSubject$.next(applications);
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts
index 941d693940b..5c03534720e 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/activity-cards/password-change-metric.component.ts
@@ -191,7 +191,7 @@ export class PasswordChangeMetricComponent implements OnInit {
   async assignTasks() {
     await this.accessIntelligenceSecurityTasksService.assignTasks(
       this.organizationId,
-      this.allApplicationsDetails,
+      this.allApplicationsDetails.filter((app) => app.isMarkedAsCritical),
     );
   }
 }