diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts
index f57507e3d..44ab67e45 100644
--- a/apps/api/src/app/activities/activities.service.ts
+++ b/apps/api/src/app/activities/activities.service.ts
@@ -746,10 +746,10 @@ export class ActivitiesService {
         const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
 
         const [
-          feeInAssetProfileCurrency,
-          feeInBaseCurrency,
-          unitPriceInAssetProfileCurrency,
-          valueInBaseCurrency
+          feeInAssetProfileCurrency = 0,
+          feeInBaseCurrency = 0,
+          unitPriceInAssetProfileCurrency = 0,
+          valueInBaseCurrency = 0
         ] = await Promise.all([
           this.exchangeRateDataService.toCurrencyAtDate(
             order.fee,
diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts
index 2ecc4d3a5..ba704d5ad 100644
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@@ -592,18 +592,19 @@ export class ImportService {
 
       const value = new Big(quantity).mul(unitPrice).toNumber();
 
-      const valueInBaseCurrency = this.exchangeRateDataService.toCurrencyAtDate(
-        value,
-        currency ?? assetProfile.currency,
-        userCurrency,
-        date
-      );
+      const valueInBaseCurrency =
+        (await this.exchangeRateDataService.toCurrencyAtDate(
+          value,
+          currency ?? assetProfile.currency,
+          userCurrency,
+          date
+        )) ?? 0;
 
       activities.push({
         ...order,
         error,
         value,
-        valueInBaseCurrency: await valueInBaseCurrency,
+        valueInBaseCurrency,
         // @ts-ignore
         SymbolProfile: assetProfile
       });
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 418e60401..77cbb5b49 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -205,21 +205,21 @@ export class PortfolioService {
           switch (type) {
             case ActivityType.DIVIDEND:
               dividendInBaseCurrency +=
-                await this.exchangeRateDataService.toCurrencyAtDate(
+                (await this.exchangeRateDataService.toCurrencyAtDate(
                   new Big(quantity).mul(unitPrice).toNumber(),
                   currency ?? SymbolProfile.currency,
                   userCurrency,
                   date
-                );
+                )) ?? 0;
               break;
             case ActivityType.INTEREST:
               interestInBaseCurrency +=
-                await this.exchangeRateDataService.toCurrencyAtDate(
+                (await this.exchangeRateDataService.toCurrencyAtDate(
                   unitPrice,
                   currency ?? SymbolProfile.currency,
                   userCurrency,
                   date
-                );
+                )) ?? 0;
               break;
           }