diff --git a/CHANGELOG.md b/CHANGELOG.md
index 486dfa8593..119dc67fba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved the label of the cash positions in the holdings charts and table
+- Upgraded `dotenv` from version `17.4.2` to `18.0.3`
 
 ## 3.77.0 - 2026-10-02
 
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts
index 13686624f7..6b10d7d271 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts
@@ -39,15 +39,15 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
   templateUrl: './portfolio-summary.component.html'
 })
 export class GfPortfolioSummaryComponent implements OnChanges {
-  @Input() baseCurrency: string;
-  @Input() deviceType: string;
-  @Input() hasImpersonationId: boolean;
-  @Input() hasPermissionToUpdateUserSettings: boolean;
-  @Input() isLoading: boolean;
-  @Input() language: string;
-  @Input() locale = getLocale();
-  @Input() summary: PortfolioSummary;
-  @Input() user: User;
+  @Input() public baseCurrency?: string;
+  @Input() public deviceType: string;
+  @Input() public hasImpersonationId: boolean;
+  @Input() public hasPermissionToUpdateUserSettings: boolean;
+  @Input() public isLoading: boolean;
+  @Input() public language?: string;
+  @Input() public locale?: string = getLocale();
+  @Input() public summary?: PortfolioSummary;
+  @Input() public user?: User;
 
   public emergencyFundChanged = output<number>();
 
@@ -99,11 +99,11 @@ export class GfPortfolioSummaryComponent implements OnChanges {
   }
 
   protected get hasCashBreakdown() {
-    return !this.isLoading && this.summary?.emergencyFund?.cash > 0;
+    return !this.isLoading && (this.summary?.emergencyFund?.cash ?? 0) > 0;
   }
 
   protected get hasHoldingsBreakdown() {
-    return !this.isLoading && this.summary?.emergencyFund?.assets > 0;
+    return !this.isLoading && (this.summary?.emergencyFund?.assets ?? 0) > 0;
   }
 
   protected get holdingsInBaseCurrency() {
@@ -133,7 +133,7 @@ export class GfPortfolioSummaryComponent implements OnChanges {
     }
 
     return (
-      this.holdingsInBaseCurrency - (this.summary.emergencyFund?.assets ?? 0)
+      this.holdingsInBaseCurrency - (this.summary?.emergencyFund?.assets ?? 0)
     );
   }
 
@@ -200,7 +200,7 @@ export class GfPortfolioSummaryComponent implements OnChanges {
         this.emergencyFundChanged.emit(emergencyFund);
       },
       confirmLabel: $localize`Save`,
-      defaultValue: this.summary.emergencyFund?.total?.toString() ?? '0',
+      defaultValue: this.summary?.emergencyFund?.total?.toString() ?? '0',
       title: $localize`Please set the amount of your emergency fund.`,
       valueSuffix: this.baseCurrency
     });
diff --git a/package-lock.json b/package-lock.json
index 877a61cb0d..b01c143378 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,7 +71,7 @@
         "countries-list": "3.4.1",
         "countup.js": "2.10.1",
         "date-fns": "4.4.0",
-        "dotenv": "17.4.2",
+        "dotenv": "18.0.3",
         "dotenv-expand": "13.0.0",
         "envalid": "8.2.0",
         "express": "5.2.1",
@@ -18022,6 +18022,19 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/c12/node_modules/dotenv": {
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
+      "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
+      "devOptional": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/c12/node_modules/jiti": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
@@ -20710,10 +20723,13 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "17.4.2",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
-      "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-18.0.3.tgz",
+      "integrity": "sha512-/8CJTyL817qPnfbQrJgOEcrU3fDrJkRIoXBE566wHuvIXKOCHUZhPqGPbCPi9SogjdGnreF0TlvnTgK6J/8zpA==",
       "license": "BSD-2-Clause",
+      "bin": {
+        "dotenv": "dist/index.cjs"
+      },
       "engines": {
         "node": ">=12"
       },
@@ -20736,6 +20752,18 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/dotenv-expand/node_modules/dotenv": {
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
+      "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
diff --git a/package.json b/package.json
index 264cf0a21b..f40bfb50cf 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "countries-list": "3.4.1",
     "countup.js": "2.10.1",
     "date-fns": "4.4.0",
-    "dotenv": "17.4.2",
+    "dotenv": "18.0.3",
     "dotenv-expand": "13.0.0",
     "envalid": "8.2.0",
     "express": "5.2.1",