diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
index 6e1336de09..a1ef0ca434 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@@ -219,7 +219,7 @@
                 i18n
                 size="medium"
                 [isLoading]="isLoading"
-                [value]="assetProfile?.currency"
+                [value]="assetProfile?.currency ?? null"
                 >Currency</gf-value
               >
             </div>
@@ -228,7 +228,7 @@
                 size="medium"
                 [enableCopyToClipboardButton]="true"
                 [hidden]="!assetProfile?.isin"
-                [value]="assetProfile?.isin"
+                [value]="assetProfile?.isin ?? null"
                 >ISIN</gf-value
               >
             </div>
@@ -249,7 +249,7 @@
                 size="medium"
                 [isLoading]="isLoading"
                 [locale]="data.locale"
-                [value]="assetProfile?.activitiesCount"
+                [value]="assetProfile?.activitiesCount ?? null"
                 >Activities</gf-value
               >
             </div>
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
index 2b378a4d60..4242b5b37b 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -342,7 +342,7 @@
                 size="medium"
                 [enableCopyToClipboardButton]="true"
                 [hidden]="!assetProfile?.isin"
-                [value]="assetProfile?.isin"
+                [value]="assetProfile?.isin ?? null"
                 >ISIN</gf-value
               >
             </div>
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
index 8846c14a7c..1e10210a6a 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@@ -5,7 +5,7 @@
       <gf-value
         class="justify-content-end"
         [isLoading]="isLoading"
-        [value]="timeInMarket"
+        [value]="timeInMarket ?? null"
       />
     </div>
   </div>
@@ -397,7 +397,7 @@
         [locale]="locale"
         [precision]="precision"
         [unit]="displayedCurrency"
-        [value]="summary?.totalValueInBaseCurrency"
+        [value]="summary?.totalValueInBaseCurrency ?? null"
       />
     </div>
   </div>
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index adb4f188d7..56dcb268f6 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -16,7 +16,7 @@
             size="medium"
             [isLoading]="isLoading"
             [isPercent]="true"
-            [value]="portfolioDetails?.summary?.filteredValueInPercentage"
+            [value]="portfolioDetails?.summary?.filteredValueInPercentage ?? null"
           />
         </mat-card-header>
         <mat-card-content>
@@ -214,7 +214,7 @@
                 size="large"
                 [isLoading]="isLoading"
                 [isPercent]="true"
-                [value]="markets?.developedMarkets?.valueInPercentage"
+                [value]="markets?.developedMarkets?.valueInPercentage ?? null"
                 >Developed Markets</gf-value
               >
             </div>
@@ -224,7 +224,7 @@
                 size="large"
                 [isLoading]="isLoading"
                 [isPercent]="true"
-                [value]="markets?.emergingMarkets?.valueInPercentage"
+                [value]="markets?.emergingMarkets?.valueInPercentage ?? null"
                 >Emerging Markets</gf-value
               >
             </div>
@@ -234,7 +234,7 @@
                 size="large"
                 [isLoading]="isLoading"
                 [isPercent]="true"
-                [value]="markets?.otherMarkets?.valueInPercentage"
+                [value]="markets?.otherMarkets?.valueInPercentage ?? null"
                 >Other Markets</gf-value
               >
             </div>
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.html b/libs/ui/src/lib/accounts-table/accounts-table.component.html
index 60be93ad8a..8298e74a33 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.html
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.html
@@ -183,7 +183,7 @@
           class="d-inline-block justify-content-end"
           [isCurrency]="true"
           [locale]="locale()"
-          [value]="totalBalanceInBaseCurrency()"
+          [value]="totalBalanceInBaseCurrency() ?? null"
         />
       </td>
     </ng-container>
@@ -218,7 +218,7 @@
           class="d-inline-block justify-content-end"
           [isCurrency]="true"
           [locale]="locale()"
-          [value]="totalValueInBaseCurrency()"
+          [value]="totalValueInBaseCurrency() ?? null"
         />
       </td>
     </ng-container>
@@ -253,7 +253,7 @@
           class="d-inline-block justify-content-end"
           [isCurrency]="true"
           [locale]="locale()"
-          [value]="totalValueInBaseCurrency()"
+          [value]="totalValueInBaseCurrency() ?? null"
         />
       </td>
     </ng-container>