diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts
index 821185e11..298b8ab20 100644
--- a/apps/api/src/app/activities/activities.service.ts
+++ b/apps/api/src/app/activities/activities.service.ts
@@ -469,7 +469,7 @@ export class ActivitiesService {
     sortColumn,
     sortDirection = 'asc',
     startDate,
-    take = Number.MAX_SAFE_INTEGER,
+    take,
     types,
     userCurrency,
     userId,
diff --git a/apps/api/src/events/market-data-updated.event.ts b/apps/api/src/events/market-data-updated.event.ts
new file mode 100644
index 000000000..140a7564e
--- /dev/null
+++ b/apps/api/src/events/market-data-updated.event.ts
@@ -0,0 +1 @@
+export const MARKET_DATA_UPDATED = 'market-data.updated';
diff --git a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
index 3ee251ee8..450b4abff 100644
--- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
@@ -27,6 +27,7 @@ import {
 import { isNumber } from 'lodash';
 import ms from 'ms';
 
+import { MARKET_DATA_UPDATED } from '../../events/market-data-updated.event';
 import { ExchangeRatesByCurrency } from './interfaces/exchange-rate-data.interface';
 
 @Injectable()
@@ -355,7 +356,7 @@ export class ExchangeRateDataService {
     return undefined;
   }
 
-  @OnEvent('market-data.updated')
+  @OnEvent(MARKET_DATA_UPDATED)
   public onMarketDataUpdated(event: { symbol: string }) {
     this.exchangeRateCache.delete(event.symbol);
     this.pendingLoads.delete(event.symbol);
diff --git a/apps/api/src/services/market-data/market-data.service.ts b/apps/api/src/services/market-data/market-data.service.ts
index ea1d630e1..ce523a646 100644
--- a/apps/api/src/services/market-data/market-data.service.ts
+++ b/apps/api/src/services/market-data/market-data.service.ts
@@ -14,6 +14,8 @@ import {
   Prisma
 } from '@prisma/client';
 
+import { MARKET_DATA_UPDATED } from '../../events/market-data-updated.event';
+
 @Injectable()
 export class MarketDataService {
   public constructor(
@@ -29,7 +31,7 @@ export class MarketDataService {
       }
     });
 
-    this.eventEmitter.emit('market-data.updated', { symbol });
+    this.eventEmitter.emit(MARKET_DATA_UPDATED, { symbol });
 
     return result;
   }
@@ -194,7 +196,7 @@ export class MarketDataService {
       }
     });
 
-    this.eventEmitter.emit('market-data.updated', { symbol });
+    this.eventEmitter.emit(MARKET_DATA_UPDATED, { symbol });
   }
 
   public async updateAssetProfileIdentifier(
@@ -212,10 +214,10 @@ export class MarketDataService {
       }
     });
 
-    this.eventEmitter.emit('market-data.updated', {
+    this.eventEmitter.emit(MARKET_DATA_UPDATED, {
       symbol: oldAssetProfileIdentifier.symbol
     });
-    this.eventEmitter.emit('market-data.updated', {
+    this.eventEmitter.emit(MARKET_DATA_UPDATED, {
       symbol: newAssetProfileIdentifier.symbol
     });
 
@@ -242,7 +244,7 @@ export class MarketDataService {
       update: { marketPrice: data.marketPrice, state: data.state }
     });
 
-    this.eventEmitter.emit('market-data.updated', {
+    this.eventEmitter.emit(MARKET_DATA_UPDATED, {
       symbol: where.dataSource_date_symbol.symbol
     });
 
@@ -287,7 +289,7 @@ export class MarketDataService {
 
     const symbols = [...new Set(data.map((d) => d.symbol as string))];
     for (const symbol of symbols) {
-      this.eventEmitter.emit('market-data.updated', { symbol });
+      this.eventEmitter.emit(MARKET_DATA_UPDATED, { symbol });
     }
 
     return result;