diff --git a/src/aare/daq/aaredb.py b/src/aare/daq/aaredb.py
index 6a524cc6..763e4ca6 100644
--- a/src/aare/daq/aaredb.py
+++ b/src/aare/daq/aaredb.py
@@ -320,10 +320,10 @@ class AareWrapper:
         if sample is None:
             return
 
-        payload = self.format_gridscan_payload(sample, raster_result, raster_request, geom, com, beam_mark_pxl).model_dump()
-
-        if payload is None:
+        payload_model = self.format_gridscan_payload(sample, raster_result, raster_request, geom, com, beam_mark_pxl)
+        if payload_model is None:
             return
+        payload = payload_model.model_dump()
 
         url = f"{self.__host}/protected_router/gridscan_runner/ingest"
         headers = {
@@ -389,10 +389,10 @@ class AareWrapper:
         if sample is None:
             return
 
-        payload = self.format_scan_payload(sample, result, geom, beam_mark_pxl).model_dump()
-
-        if payload is None:
+        payload_model = self.format_scan_payload(sample, result, geom, beam_mark_pxl)
+        if payload_model is None:
             return
+        payload = payload_model.model_dump()
 
         url = f"{self.__host}/protected_router/scan_runner/ingest"
         headers = {