diff --git a/CHANGELOG.md b/CHANGELOG.md
index 752fc2397..58dd3fdbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved the tags from the info to the user service
 - Switched the `prefer-const` rule from `warn` to `error` in the `eslint` configuration
 
+### Fixed
+
+- Fixed an exception in the portfolio details endpoint caused by a calculation of the allocations by market
+
 ## 2.113.0 - 2024-10-06
 
 ### Added
diff --git a/apps/api/src/app/endpoints/public/public.controller.ts b/apps/api/src/app/endpoints/public/public.controller.ts
index 9399f97bf..7488e4201 100644
--- a/apps/api/src/app/endpoints/public/public.controller.ts
+++ b/apps/api/src/app/endpoints/public/public.controller.ts
@@ -76,7 +76,7 @@ export class PublicController {
       })
     ]);
 
-    Object.values(markets).forEach((market) => {
+    Object.values(markets ?? {}).forEach((market) => {
       delete market.valueInBaseCurrency;
     });
 
diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index ff0c31060..326dda151 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -172,10 +172,10 @@ export class PortfolioController {
       }) ||
       isRestrictedView(this.request.user)
     ) {
-      Object.values(markets).forEach((market) => {
+      Object.values(markets ?? {}).forEach((market) => {
         delete market.valueInBaseCurrency;
       });
-      Object.values(marketsAdvanced).forEach((market) => {
+      Object.values(marketsAdvanced ?? {}).forEach((market) => {
         delete market.valueInBaseCurrency;
       });