diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts
index 6633bba32a4..b7c11dd6ef2 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/drawer-models.types.ts
@@ -13,7 +13,7 @@ export type DrawerDetails = {
   open: boolean;
   invokerId: string;
   activeDrawerType: DrawerType;
-  atRiskMemberDetails?: AtRiskMemberDetail[];
+  atRiskMemberDetails?: AtRiskMemberDetail[] | null;
   appAtRiskMembers?: AppAtRiskMembersDialogParams | null;
   atRiskAppDetails?: AtRiskApplicationDetail[] | null;
 };
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
index 4e7fcf083a1..3c6d847bc92 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts
@@ -109,7 +109,7 @@ export class RiskInsightsComponent implements OnInit, OnDestroy {
       .subscribe((details) => {
         if (details.activeDrawerType !== DrawerType.None) {
           this.dialogService.openDrawer(RiskInsightsDrawerDialogComponent, {
-            data: { ...details },
+            data: details,
           });
         } else {
           this.dialogService.closeAll();
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html
index 008e17cf11e..7e9f728afa3 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/shared/risk-insights-drawer-dialog.component.html
@@ -1,11 +1,11 @@
 @if (isActiveDrawerType(drawerTypes.OrgAtRiskMembers)) {
   <bit-dialog dialogSize="large" disablePadding="false">
     <ng-container bitDialogTitle>
-      <span>{{ "atRiskMembersWithCount" | i18n: drawerDetails.atRiskMemberDetails.length }}</span>
+      <span>{{ "atRiskMembersWithCount" | i18n: drawerDetails.atRiskMemberDetails?.length }}</span>
     </ng-container>
     <ng-container bitDialogContent>
       <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
-        (drawerDetails.atRiskMemberDetails.length > 0
+        (drawerDetails.atRiskMemberDetails?.length > 0
           ? "atRiskMembersDescription"
           : "atRiskMembersDescriptionNone"
         ) | i18n
@@ -62,11 +62,13 @@
 @if (isActiveDrawerType(drawerTypes.OrgAtRiskApps)) {
   <bit-dialog dialogSize="large" disablePadding="false">
     <ng-container bitDialogTitle>
-      <span>{{ "atRiskApplicationsWithCount" | i18n: drawerDetails.atRiskAppDetails.length }}</span>
+      <span>{{
+        "atRiskApplicationsWithCount" | i18n: drawerDetails.atRiskAppDetails?.length
+      }}</span>
     </ng-container>
     <ng-container bitDialogContent>
       <span bitTypography="body1" class="tw-text-muted tw-text-sm">{{
-        (drawerDetails.atRiskAppDetails.length > 0
+        (drawerDetails.atRiskAppDetails?.length > 0
           ? "atRiskApplicationsDescription"
           : "atRiskApplicationsDescriptionNone"
         ) | i18n