diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0259f1711..20df270ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Refactored the create or update access dialog component to standalone
 
+### Fixed
+
+- Fixed an issue related to the error handling in the data provider status component
+
 ## 2.196.0 - 2025-09-04
 
 ### Changed
@@ -23,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactored the benchmark comparator component to standalone
 - Refactored the portfolio summary component to standalone
 - Refactored the world map chart component to standalone
-- Enbabled the trim option in the `extract-i18n` configuration
+- Enabled the trim option in the `extract-i18n` configuration
 - Improved the language localization for German (`de`)
 - Upgraded the _Stripe_ dependencies
 - Upgraded `ngx-device-detector` from version `10.0.2` to `10.1.0`
diff --git a/apps/client/src/app/components/data-provider-status/data-provider-status.component.ts b/apps/client/src/app/components/data-provider-status/data-provider-status.component.ts
index 02cda1056..0f638961c 100644
--- a/apps/client/src/app/components/data-provider-status/data-provider-status.component.ts
+++ b/apps/client/src/app/components/data-provider-status/data-provider-status.component.ts
@@ -33,12 +33,12 @@ export class GfDataProviderStatusComponent implements OnDestroy, OnInit {
     this.status$ = this.dataService
       .fetchDataProviderHealth(this.dataSource)
       .pipe(
-        catchError(() => {
-          return of({ isHealthy: false });
-        }),
         map(() => {
           return { isHealthy: true };
         }),
+        catchError(() => {
+          return of({ isHealthy: false });
+        }),
         takeUntil(this.unsubscribeSubject)
       );
   }