diff --git a/apps/api/src/app/portfolio/rules.service.ts b/apps/api/src/app/portfolio/rules.service.ts
index 107187976e..404e843919 100644
--- a/apps/api/src/app/portfolio/rules.service.ts
+++ b/apps/api/src/app/portfolio/rules.service.ts
@@ -20,7 +20,7 @@ export class RulesService {
         userSettings: aUserSettings
       });
 
-      if (settings?.isActive) {
+      if (settings.isActive) {
         const { evaluation, value } = rule.evaluate(settings);
 
         return {
diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
index c2c4e84883..6044c0a250 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@@ -13,8 +13,8 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     languageCode: string
   ) {
     super(exchangeRateDataService, {
-      key: 'CurrencyClusterRiskBaseCurrencyCurrentInvestment',
-      languageCode
+      languageCode,
+      key: 'CurrencyClusterRiskBaseCurrencyCurrentInvestment'
     });
 
     this.holdings = holdings;
diff --git a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
index 5c32eaa9bc..de84b36912 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
@@ -13,8 +13,8 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     languageCode: string
   ) {
     super(exchangeRateDataService, {
-      key: 'CurrencyClusterRiskCurrentInvestment',
-      languageCode
+      languageCode,
+      key: 'CurrencyClusterRiskCurrentInvestment'
     });
 
     this.holdings = holdings;