diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0888e27a2..5979ebc1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Renamed `orders` to `activities` in the `Tag` database schema
+- Modularized the cron service
 - Refreshed the cryptocurrencies list
 - Improved the language localization for Dutch (`nl`)
 - Improved the language localization for Polish (`pl`)
diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts
index 87a4db5fc..6f512e89b 100644
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@@ -1,13 +1,12 @@
 import { EventsModule } from '@ghostfolio/api/events/events.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
-import { CronService } from '@ghostfolio/api/services/cron.service';
+import { CronModule } from '@ghostfolio/api/services/cron/cron.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';
 import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';
-import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
 import {
   DEFAULT_LANGUAGE_CODE,
   SUPPORTED_LANGUAGE_CODES
@@ -78,6 +77,7 @@ import { UserModule } from './user/user.module';
     CacheModule,
     ConfigModule.forRoot(),
     ConfigurationModule,
+    CronModule,
     DataGatheringModule,
     DataProviderModule,
     EventEmitterModule.forRoot(),
@@ -128,10 +128,8 @@ import { UserModule } from './user/user.module';
     SubscriptionModule,
     SymbolModule,
     TagsModule,
-    TwitterBotModule,
     UserModule,
     WatchlistModule
-  ],
-  providers: [CronService]
+  ]
 })
 export class AppModule {}
diff --git a/apps/api/src/services/cron/cron.module.ts b/apps/api/src/services/cron/cron.module.ts
new file mode 100644
index 000000000..06f9d2caa
--- /dev/null
+++ b/apps/api/src/services/cron/cron.module.ts
@@ -0,0 +1,23 @@
+import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
+import { DataGatheringModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';
+import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
+
+import { Module } from '@nestjs/common';
+
+import { CronService } from './cron.service';
+
+@Module({
+  imports: [
+    ConfigurationModule,
+    DataGatheringModule,
+    ExchangeRateDataModule,
+    PropertyModule,
+    TwitterBotModule,
+    UserModule
+  ],
+  providers: [CronService]
+})
+export class CronModule {}
diff --git a/apps/api/src/services/cron.service.ts b/apps/api/src/services/cron/cron.service.ts
similarity index 79%
rename from apps/api/src/services/cron.service.ts
rename to apps/api/src/services/cron/cron.service.ts
index 3d4aff08b..b770aa2d7 100644
--- a/apps/api/src/services/cron.service.ts
+++ b/apps/api/src/services/cron/cron.service.ts
@@ -1,4 +1,9 @@
 import { UserService } from '@ghostfolio/api/app/user/user.service';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
+import { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service';
+import { TwitterBotService } from '@ghostfolio/api/services/twitter-bot/twitter-bot.service';
 import {
   DATA_GATHERING_QUEUE_PRIORITY_LOW,
   GATHER_ASSET_PROFILE_PROCESS_JOB_NAME,
@@ -10,12 +15,6 @@ import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { Injectable } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';
 
-import { ConfigurationService } from './configuration/configuration.service';
-import { ExchangeRateDataService } from './exchange-rate-data/exchange-rate-data.service';
-import { PropertyService } from './property/property.service';
-import { DataGatheringService } from './queues/data-gathering/data-gathering.service';
-import { TwitterBotService } from './twitter-bot/twitter-bot.service';
-
 @Injectable()
 export class CronService {
   private static readonly EVERY_SUNDAY_AT_LUNCH_TIME = '0 12 * * 0';
@@ -43,7 +42,9 @@ export class CronService {
 
   @Cron(CronExpression.EVERY_DAY_AT_5PM)
   public async runEveryDayAtFivePm() {
-    this.twitterBotService.tweetFearAndGreedIndex();
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      this.twitterBotService.tweetFearAndGreedIndex();
+    }
   }
 
   @Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT)