diff --git a/daq/src/mxlibs3/jfjoch.py b/daq/src/mxlibs3/jfjoch.py
index d89e22c8..85b02b63 100644
--- a/daq/src/mxlibs3/jfjoch.py
+++ b/daq/src/mxlibs3/jfjoch.py
@@ -47,11 +47,18 @@ class JFJochWrapper:
             vector= [0,1,0]
         )
 
+        if r.screening:
+            images = 1
+            trigger = r.steps
+        else:
+            images = r.steps
+            trigger = 1
+
         dataset_settings = jfjoch_client.DatasetSettings(
             beam_x_pxl=d.beam_center_pxl[0],
             beam_y_pxl=d.beam_center_pxl[1],
-            ntrigger= 1,
-            images_per_trigger=r.steps,
+            ntrigger= trigger,
+            images_per_trigger=images,
             detector_distance_mm=d.dtz_mm,
             file_prefix=f"{pgroup}/raw/{r.file_prefix}",
             incident_energy_keV=d.energy_keV,