diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py
index 2d6d49fa..7cc07841 100644
--- a/src/aare/devices/jfjoch.py
+++ b/src/aare/devices/jfjoch.py
@@ -201,6 +201,8 @@ class JFJochWrapper:
             detect_ice_rings=True,
             async_start=async_start,
             smargon=smargon_phi_chi,
+            #beam_size_x_um=s.diffraction.beam_size_x,
+            #beam_size_y_um=s.diffraction.beam_size_y,
         )
 
         # settup grid or goniometer settings adn add to dataset settings
@@ -212,8 +214,15 @@ class JFJochWrapper:
                 step_y_um=r.grid_size_mm.y * 1000.0,
                 vertical=False,
             )
+            goniometer_settings = jfjoch_client.RotationAxis(
+                step=0,
+                start=r.omega_deg,
+                name="omega",
+                vector=[-1, 0, 0],
+                screening_wedge_deg=0,
+            )
             dataset_settings.grid_scan = grid_settings
-
+            dataset_settings.goniometer = goniometer_settings
         else:
             goniometer_settings = jfjoch_client.RotationAxis(
                 step=r.incr_omega_deg,