diff --git a/CHANGELOG.md b/CHANGELOG.md
index e80afeb2..7a511761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Hid the data provider warning while loading
 - Fixed an exception with the market state caused by a failed data provider request
 - Fixed the reload of the position detail dialog (with query parameters)
 
diff --git a/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.html b/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.html
index 9752c044..cd61f901 100644
--- a/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.html
+++ b/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.html
@@ -3,12 +3,15 @@
     <div
       class="flex-grow-1 status text-muted text-right"
       [title]="
-        hasError
+        hasError && !isLoading
           ? 'Sorry! Our data provider partner is experiencing the hiccups.'
           : ''
       "
     >
-      <ion-icon *ngIf="hasError" name="alert-circle-outline"></ion-icon>
+      <ion-icon
+        *ngIf="hasError && !isLoading"
+        name="alert-circle-outline"
+      ></ion-icon>
     </div>
     <div *ngIf="isLoading" class="align-items-center d-flex">
       <ngx-skeleton-loader