diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 72d6db498..6d0cde40e 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -284,8 +284,8 @@ export class PortfolioService {
     const { activities } =
       await this.orderService.getOrdersForPortfolioCalculator({
         filters,
-        userId,
-        userCurrency
+        userCurrency,
+        userId
       });
 
     if (activities.length === 0) {
@@ -940,8 +940,8 @@ export class PortfolioService {
     const { activities } =
       await this.orderService.getOrdersForPortfolioCalculator({
         filters,
-        userId,
-        userCurrency
+        userCurrency,
+        userId
       });
 
     if (activities.length === 0) {
@@ -2025,10 +2025,7 @@ export class PortfolioService {
   private getUserPerformanceCalculationType(
     aUser: UserWithSettings
   ): PerformanceCalculationType {
-    return (
-      aUser?.Settings?.settings.performanceCalculationType ??
-      PerformanceCalculationType.ROI
-    );
+    return aUser?.Settings?.settings.performanceCalculationType;
   }
 
   private async getValueOfAccountsAndPlatforms({
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.html b/apps/client/src/app/components/user-account-settings/user-account-settings.html
index c4655a4ce..72d5aa678 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.html
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.html
@@ -25,7 +25,7 @@
               </mat-form-field>
             </div>
           </div>
-          @if (user?.settings?.isExperimentalFeatures && !!user?.subscription) {
+          @if (user?.settings?.isExperimentalFeatures && !user?.subscription) {
             <div class="d-flex mb-2">
               <div class="align-items-center d-flex pt-1 pt-1 w-50">
                 <ng-container i18n>Performance Calculation</ng-container>