diff --git a/Control/CalypsoExample/Reconstruction/CMakeLists.txt b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
index 4bccc2d7de74eca17c5dada36a81dac720664028..f821257234e5758a0c92a1d13e1b0d5df44f2843 100644
--- a/Control/CalypsoExample/Reconstruction/CMakeLists.txt
+++ b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
@@ -21,6 +21,7 @@ atlas_add_test( ProdRecoTI12
     SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-001920-filtered.raw TI12Data
     PROPERTIES TIMEOUT 300 )
 
+# Turn this off until we figure out the CKF behavior on testbeam data
 atlas_add_test( ProdRecoTestBeam
     SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-003613-filtered.raw TestBeamData
     PROPERTIES TIMEOUT 300 )
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index f9a7ebbade10f4ec040504bd223ca057008ece2e..2063b729cb1c5a09ac4a2e90c914fc7096a85412 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -96,6 +96,10 @@ ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"   # Use MC conditions for now
 ConfigFlags.Input.ProjectName = "data20"
 ConfigFlags.GeoModel.Align.Dynamic    = False
 
+useCKF = True
+# Enable ACTS material corrections, this crashes testbeam geometries
+ConfigFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
+
 # TI12 Cosmics geometry
 if runtype == "TI12Data":
     ConfigFlags.GeoModel.FaserVersion = "FASER-01" 
@@ -105,6 +109,7 @@ if runtype == "TI12Data":
 elif runtype == "TestBeamData" or runtype == "TestBeam2021":
     ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" 
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00"
+    useCKF = False
 
 # New TI12 geometry (ugh)
 elif runtype == "TI12Data02":
@@ -116,10 +121,6 @@ elif runtype == "TI12Data03":
     ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" 
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"
 
-    # Enable ACTS material corrections, this crashes testbeam geometries
-    ConfigFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
-
-
 else:
     print("Invalid run type found:", runtype)
     print("Specify correct type or update list")
@@ -190,15 +191,18 @@ acc.merge(SegmentFitAlgCfg(ConfigFlags,
                            SharedHitFraction=0.61, 
                            MinClustersPerFit=5, 
                            TanThetaXZCut=0.083))
-# 
-# Ghost removal
-from FaserActsKalmanFilter.GhostBustersConfig import GhostBustersCfg
-acc.merge(GhostBustersCfg(ConfigFlags))
 
-#
-# Kalman Filter for tracking
-from FaserActsKalmanFilter.CKF2Config import CKF2Cfg
-acc.merge(CKF2Cfg(ConfigFlags, noDiagnostics=True))
+# Turn on CKF track finding 
+if useCKF:
+    # 
+    # Ghost removal
+    from FaserActsKalmanFilter.GhostBustersConfig import GhostBustersCfg
+    acc.merge(GhostBustersCfg(ConfigFlags))
+
+    #
+    # Kalman Filter for tracking
+    from FaserActsKalmanFilter.CKF2Config import CKF2Cfg
+    acc.merge(CKF2Cfg(ConfigFlags, noDiagnostics=True))
 
 #
 # Configure output