diff --git a/open-robotics/src/main/java/com/openrobotics/controllers/SetupController.java b/open-robotics/src/main/java/com/openrobotics/controllers/SetupController.java
index 07ec32f..33451d1 100644
--- a/open-robotics/src/main/java/com/openrobotics/controllers/SetupController.java
+++ b/open-robotics/src/main/java/com/openrobotics/controllers/SetupController.java
@@ -799,11 +799,6 @@ private SimulationEngine buildEngineFromSetup() {
 
         Dispatcher dispatcher = new Dispatcher();
 
-        // Seed the dispatcher with the initial rack-to-station workload if not in manual mode
-        if (!isManualMode && maxTasks > 0 && map != null) {
-            generateFixedTasks(map, seed, maxTasks, dispatcher);
-        }
-
         String runName = runNameField.getText().trim();
         if (runName.isEmpty()) runName = DEFAULT_RUN_NAME;
 
diff --git a/open-robotics/src/test/java/com/openrobotics/controllers/SetupControllerTest.java b/open-robotics/src/test/java/com/openrobotics/controllers/SetupControllerTest.java
index 1bf230d..a9e320e 100644
--- a/open-robotics/src/test/java/com/openrobotics/controllers/SetupControllerTest.java
+++ b/open-robotics/src/test/java/com/openrobotics/controllers/SetupControllerTest.java
@@ -526,7 +526,7 @@ void buildEngineFromSetup_uses_field_values_defaults_and_robot_config() {
         assertEquals(77, engine.getMaxTicks());
         assertEquals(123L, engine.getSeed());
         assertTrue(engine.getCoordinationPolicy().contains(ReservationKPolicy.class.getName()));
-        assertEquals(4, engine.getDispatcher().getTotalTasksAdded());
+        assertEquals(0, engine.getDispatcher().getTotalTasksAdded());
         assertEquals(150.5f, config.batteryCapacity, 0.001f);
         assertEquals(35.5f, config.lowBatteryThreshold, 0.001f);
         assertEquals(9.5f, config.chargePerTick, 0.001f);
@@ -580,7 +580,7 @@ void buildEngineFromSetup_random_map_honors_explicit_map_seed() {
 
         assertEquals(entitySignature(first.getMap()), entitySignature(second.getMap()));
         assertEquals(111L, first.getSeed());
-        assertEquals(3, first.getDispatcher().getTotalTasksAdded());
+        assertEquals(0, first.getDispatcher().getTotalTasksAdded());
         assertEquals(1, countEntities(first.getMap(), ChargingStation.class));
         assertEquals(1, countEntities(first.getMap(), DeliveryStation.class));
     }
@@ -732,7 +732,7 @@ void startSimulation_builds_engine_from_setup_values_persists_config_and_navigat
 
         assertTrue(AppState.hasEngine());
         assertTrue(AppState.hasConfigPath());
-        assertEquals(2, AppState.getEngine().getDispatcher().getTotalTasksAdded());
+        assertEquals(0, AppState.getEngine().getDispatcher().getTotalTasksAdded());
         assertEquals(200, AppState.getEngine().getMaxTicks());
         assertNotNull(lookup("#warehouseCanvas").queryAs(Canvas.class));
     }
@@ -754,7 +754,7 @@ void startSimulation_rebuilds_existing_ui_built_engine_when_no_config_path_exist
         assertTrue(AppState.hasEngine());
         assertTrue(AppState.hasConfigPath());
         assertEquals(18, AppState.getEngine().getMap().getWidth());
-        assertEquals(1, AppState.getEngine().getDispatcher().getTotalTasksAdded());
+        assertEquals(0, AppState.getEngine().getDispatcher().getTotalTasksAdded());
         assertNotNull(lookup("#warehouseCanvas").queryAs(Canvas.class));
     }