diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts
index df64a45ec21..8ac2bd03a62 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.spec.ts
@@ -1,6 +1,6 @@
 import { randomUUID } from "crypto";
 
-import { fakeAsync, flush, TestBed } from "@angular/core/testing";
+import { fakeAsync, flush } from "@angular/core/testing";
 import { mock } from "jest-mock-extended";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -22,15 +22,7 @@ describe("CriticalAppsApiService", () => {
   const encryptService = mock<EncryptService>();
 
   beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [
-        CriticalAppsApiService,
-        { provide: ApiService, useValue: apiService },
-        { provide: KeyService, useValue: keyService },
-        { provide: EncryptService, useValue: encryptService },
-      ],
-    });
-    service = TestBed.inject(CriticalAppsApiService);
+    service = new CriticalAppsApiService(apiService, keyService, encryptService);
 
     // reset mocks
     jest.resetAllMocks();
diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts
index 168e615937d..67d5e34350f 100644
--- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts
+++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts
@@ -1,6 +1,5 @@
 import { Injectable, OnDestroy } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { BehaviorSubject, firstValueFrom, map, Observable } from "rxjs";
+import { BehaviorSubject, firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
@@ -18,9 +17,10 @@ import { KeyService } from "@bitwarden/key-management";
 export class CriticalAppsApiService implements OnDestroy {
   private orgId = new BehaviorSubject<OrganizationId | null>(null);
   private criticalAppsList = new BehaviorSubject<PasswordHealthReportApplicationsResponse[]>([]);
+  private teardown = new Subject<void>();
 
   private fetchOrg$ = this.orgId
-    .pipe(takeUntilDestroyed())
+    .pipe(takeUntil(this.teardown))
     .subscribe((orgId) => this.retrieveCriticalApps(orgId));
 
   ngOnDestroy(): void {