diff --git a/apps/client/src/app/pages/public/public-page.component.ts b/apps/client/src/app/pages/public/public-page.component.ts
index 3b149cd08..e354f8a1b 100644
--- a/apps/client/src/app/pages/public/public-page.component.ts
+++ b/apps/client/src/app/pages/public/public-page.component.ts
@@ -69,6 +69,7 @@ export class GfPublicPageComponent implements OnInit {
   protected hasPermissionForSubscription: boolean;
   protected holdings: PublicPortfolioResponse['holdings'][string][];
   protected info: InfoItem;
+  protected isLoading = true;
   protected latestActivitiesDataSource: MatTableDataSource<
     PublicPortfolioResponse['latestActivities'][0]
   >;
@@ -138,6 +139,8 @@ export class GfPublicPageComponent implements OnInit {
           this.publicPortfolioDetails.latestActivities
         );
 
+        this.isLoading = false;
+
         this.changeDetectorRef.markForCheck();
       });
   }
diff --git a/apps/client/src/app/pages/public/public-page.html b/apps/client/src/app/pages/public/public-page.html
index 57bc1e95f..e0e855585 100644
--- a/apps/client/src/app/pages/public/public-page.html
+++ b/apps/client/src/app/pages/public/public-page.html
@@ -15,11 +15,11 @@
             i18n
             size="large"
             [colorizeSign]="true"
+            [isLoading]="isLoading"
             [isPercent]="true"
             [precision]="2"
             [value]="
-              publicPortfolioDetails?.performance?.['1d']?.relativeChange ??
-              undefined
+              publicPortfolioDetails?.performance?.['1d']?.relativeChange
             "
             >Today</gf-value
           >
@@ -33,11 +33,11 @@
             i18n
             size="large"
             [colorizeSign]="true"
+            [isLoading]="isLoading"
             [isPercent]="true"
             [precision]="2"
             [value]="
-              publicPortfolioDetails?.performance?.['ytd']?.relativeChange ??
-              undefined
+              publicPortfolioDetails?.performance?.['ytd']?.relativeChange
             "
             >This year</gf-value
           >
@@ -51,11 +51,11 @@
             i18n
             size="large"
             [colorizeSign]="true"
+            [isLoading]="isLoading"
             [isPercent]="true"
             [precision]="2"
             [value]="
-              publicPortfolioDetails?.performance?.['max']?.relativeChange ??
-              undefined
+              publicPortfolioDetails?.performance?.['max']?.relativeChange
             "
             >From the beginning</gf-value
           >