diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py
index 1324a0b7..d5183100 100644
--- a/src/aare/devices/jfjoch.py
+++ b/src/aare/devices/jfjoch.py
@@ -174,7 +174,7 @@ class JFJochWrapper:
         # build common dataset settings
         if s.geom.smargon.phi_deg is not None and s.geom.smargon.chi_deg is not None:
             smargon_phi_chi = DatasetSettingsSmargon(
-                phi_deg=s.geom.smargon.phi_deg, chi_deg=s.geom.smargon.chi_deg
+                phi_deg=s.geom.smargon.phi_deg, chi_deg=max(s.geom.smargon.chi_deg, 0)
             )
         else:
             smargon_phi_chi = None