diff --git a/apps/api/src/services/data-gathering.module.ts b/apps/api/src/services/data-gathering.module.ts
index 71ec5e846..85f2f4983 100644
--- a/apps/api/src/services/data-gathering.module.ts
+++ b/apps/api/src/services/data-gathering.module.ts
@@ -1,7 +1,6 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { DataEnhancerModule } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.module';
-import { TrackinsightDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/trackinsight/trackinsight.service';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { Module } from '@nestjs/common';
@@ -16,14 +15,7 @@ import { ExchangeRateDataModule } from './exchange-rate-data.module';
     ExchangeRateDataModule,
     PrismaModule
   ],
-  providers: [
-    {
-      inject: [TrackinsightDataEnhancerService],
-      provide: 'DataEnhancers',
-      useFactory: (trackinsight) => [trackinsight]
-    },
-    DataGatheringService
-  ],
-  exports: ['DataEnhancers', DataGatheringService]
+  providers: [DataGatheringService],
+  exports: [DataEnhancerModule, DataGatheringService]
 })
 export class DataGatheringModule {}
diff --git a/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts b/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts
index fcdaad67c..9d4c0704d 100644
--- a/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts
@@ -2,7 +2,14 @@ import { TrackinsightDataEnhancerService } from '@ghostfolio/api/services/data-p
 import { Module } from '@nestjs/common';
 
 @Module({
-  exports: [TrackinsightDataEnhancerService],
-  providers: [TrackinsightDataEnhancerService]
+  exports: ['DataEnhancers', TrackinsightDataEnhancerService],
+  providers: [
+    {
+      inject: [TrackinsightDataEnhancerService],
+      provide: 'DataEnhancers',
+      useFactory: (trackinsight) => [trackinsight]
+    },
+    TrackinsightDataEnhancerService
+  ]
 })
 export class DataEnhancerModule {}