diff --git a/apps/api/src/services/queues/data-gathering/data-gathering.module.ts b/apps/api/src/services/queues/data-gathering/data-gathering.module.ts
index b836c817d..ebf39d6a6 100644
--- a/apps/api/src/services/queues/data-gathering/data-gathering.module.ts
+++ b/apps/api/src/services/queues/data-gathering/data-gathering.module.ts
@@ -19,13 +19,6 @@ import { DataGatheringProcessor } from './data-gathering.processor';
 
 @Module({
   imports: [
-    BullModule.registerQueue({
-      limiter: {
-        duration: ms('4 seconds'),
-        max: 1
-      },
-      name: DATA_GATHERING_QUEUE
-    }),
     BullBoardModule.forFeature({
       name: DATA_GATHERING_QUEUE,
       adapter: BullAdapter,
@@ -33,6 +26,13 @@ import { DataGatheringProcessor } from './data-gathering.processor';
         readOnlyMode: true
       }
     }),
+    BullModule.registerQueue({
+      limiter: {
+        duration: ms('4 seconds'),
+        max: 1
+      },
+      name: DATA_GATHERING_QUEUE
+    }),
     ConfigurationModule,
     DataEnhancerModule,
     DataProviderModule,
diff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts
index a47ca0f46..4628d7214 100644
--- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts
+++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts
@@ -24,6 +24,13 @@ import { PortfolioSnapshotProcessor } from './portfolio-snapshot.processor';
   exports: [BullModule, PortfolioSnapshotService],
   imports: [
     AccountBalanceModule,
+    BullBoardModule.forFeature({
+      name: PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE,
+      adapter: BullAdapter,
+      options: {
+        readOnlyMode: true
+      }
+    }),
     BullModule.registerQueue({
       name: PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE,
       settings: {
@@ -34,13 +41,6 @@ import { PortfolioSnapshotProcessor } from './portfolio-snapshot.processor';
         )
       }
     }),
-    BullBoardModule.forFeature({
-      name: PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE,
-      adapter: BullAdapter,
-      options: {
-        readOnlyMode: true
-      }
-    }),
     ConfigurationModule,
     DataProviderModule,
     ExchangeRateDataModule,