diff --git a/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java b/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java
index b52d306f7a..d01d7385ad 100644
--- a/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java
+++ b/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java
@@ -46,14 +46,12 @@ public class AHDCEngine extends ReconstructionEngine {
 
     @Override
     public void detectorChanged(int run) {
-        // FIXME:  move geometry initialization here
+        factory = (new AlertDCFactory()).createDetectorCLAS(new DatabaseConstantProvider(run,"default"));
     }
 
     @Override
     public boolean init() {
 
-        factory = (new AlertDCFactory()).createDetectorCLAS(new DatabaseConstantProvider());
-
         Map<String, Integer> tableMap = new HashMap<>();
         tableMap.put("/calibration/alert/ahdc/time_offsets", 3);
         tableMap.put("/calibration/alert/ahdc/time_to_distance_wire", 3);
diff --git a/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java b/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java
index c54a7636e5..4a9d73500f 100644
--- a/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java
+++ b/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java
@@ -135,7 +135,11 @@ public ALERTEngine() {
     }
 
     @Override
-    public void detectorChanged(int run) {}
+    public void detectorChanged(int run) {
+        DatabaseConstantProvider cp = new DatabaseConstantProvider(run, "default");
+        ATOF = (new AlertTOFFactory()).createDetectorCLAS(cp);
+        AHDC = (new AlertDCFactory()).createDetectorCLAS(cp);
+    }
 
     /** 
      * ALERTEngine initialization.
@@ -150,13 +154,6 @@ public boolean init() {
         modelTrackMatching = new ModelTrackMatching();
         modelPrePID = new ModelPrePID();
 
-        AlertTOFFactory factory = new AlertTOFFactory();
-        
-        // One CCDB session for both ATOF and AHDC geometry.
-        DatabaseConstantProvider cp = new DatabaseConstantProvider(11, "default");
-        ATOF = factory.createDetectorCLAS(cp);
-        AHDC = (new AlertDCFactory()).createDetectorCLAS(cp);
-
         Map<String, Integer> tableMap = new HashMap<>();
         tableMap.put("/calibration/alert/ahdc/gains", 3);
         requireConstants(tableMap);
diff --git a/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java b/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java
index 27153fb14c..c0793e948c 100644
--- a/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java
+++ b/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java
@@ -134,17 +134,15 @@ public boolean processDataEventUser(DataEvent event) {
 
     @Override
     public void detectorChanged(int run) {
-        // FIXME:  move geometry initialization here
+        AlertTOFFactory factory = new AlertTOFFactory();
+        DatabaseConstantProvider cp = new DatabaseConstantProvider(run, "default");
+        this.ATOF = factory.createDetectorCLAS(cp);
     }
 
     @Override
     public boolean init() {
         rbc = new RecoBankWriter();
 
-        AlertTOFFactory factory = new AlertTOFFactory();
-        DatabaseConstantProvider cp = new DatabaseConstantProvider(11, "default");
-        this.ATOF = factory.createDetectorCLAS(cp);
-        
         Map<String, Integer> tableMap = new HashMap<>();
         tableMap.put("/calibration/alert/atof/effective_velocity", 3);
         tableMap.put("/calibration/alert/atof/time_walk", 4);