diff --git a/api/apps/api/src/modules/scenarios-features/move-data-from-preparation.handler.ts b/api/apps/api/src/modules/scenarios-features/move-data-from-preparation.handler.ts
index 96202b98ff..fbab052a8f 100644
--- a/api/apps/api/src/modules/scenarios-features/move-data-from-preparation.handler.ts
+++ b/api/apps/api/src/modules/scenarios-features/move-data-from-preparation.handler.ts
@@ -69,5 +69,12 @@ export class MoveDataFromPreparationHandler
         specificationId: command.specificationId,
       });
     });
+
+    this.eventBus.publish(
+      new DataMovedFormPreparationEvent(
+        command.scenarioId,
+        command.specificationId,
+      ),
+    );
   }
 }
diff --git a/api/apps/geoprocessing/src/modules/scenario-planning-units-features-aggregate/scenario-planning-units-features-aggregate-processor.ts b/api/apps/geoprocessing/src/modules/scenario-planning-units-features-aggregate/scenario-planning-units-features-aggregate-processor.ts
index ac2c3c5f7d..fb8e588925 100644
--- a/api/apps/geoprocessing/src/modules/scenario-planning-units-features-aggregate/scenario-planning-units-features-aggregate-processor.ts
+++ b/api/apps/geoprocessing/src/modules/scenario-planning-units-features-aggregate/scenario-planning-units-features-aggregate-processor.ts
@@ -44,6 +44,13 @@ export class ScenarioPlanningUnitsFeaturesAggregateProcessor
   ) {}
 
   async process(job: Job<JobInput, true>): Promise<true> {
+    /**
+     * @debt Bypassing the original query, whose results are not needed anymore,
+     * and which was expensive to run. The flow that includes this processor
+     * should be cleaned up instead, to fully bypass
+     * ScenarioPlanningUnitsFeaturesAggregateProcessor.
+     */
+    return true;
     const scenarioId = job.data.scenarioId;
     await this.entityManager.query(query, [scenarioId]);
     return true;