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 75cb9dfaec2..1dfac641d85 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
@@ -126,12 +126,9 @@ export class CriticalAppsApiService {
         return forkJoin(results);
       }),
       first(),
-      map((results: PasswordHealthReportApplicationsResponse[]) => {
-        return results;
-      }),
     );
 
-    return result$;
+    return result$ as Observable<PasswordHealthReportApplicationsResponse[]>;
   }
 
   private async filterNewEntries(orgId: OrganizationId, selectedUrls: string[]): Promise<string[]> {
@@ -172,9 +169,3 @@ export interface PasswordHealthReportApplicationsResponse {
 }
 
 export type PasswordHealthReportApplicationId = Opaque<string, "PasswordHealthReportApplicationId">;
-
-export const criticalServiceFactoryProvider = (
-  apiService: ApiService,
-  keyService: KeyService,
-  encryptService: EncryptService,
-) => new CriticalAppsApiService(apiService, keyService, encryptService);
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts
index abcac4a2442..8ad0e15af06 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts
@@ -1,9 +1,7 @@
 import { NgModule } from "@angular/core";
 
-import {
-  CriticalAppsApiService,
-  criticalServiceFactoryProvider,
-} from "@bitwarden/bit-common/tools/reports/risk-insights";
+import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
+import { CriticalAppsApiService } from "@bitwarden/bit-common/tools/reports/risk-insights";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { KeyService } from "@bitwarden/key-management";
@@ -14,11 +12,11 @@ import { RiskInsightsComponent } from "./risk-insights.component";
 @NgModule({
   imports: [RiskInsightsComponent, AccessIntelligenceRoutingModule],
   providers: [
-    {
+    safeProvider({
       provide: CriticalAppsApiService,
-      useFactory: criticalServiceFactoryProvider,
+      useClass: CriticalAppsApiService,
       deps: [ApiService, KeyService, EncryptService],
-    },
+    }),
   ],
 })
 export class AccessIntelligenceModule {}