diff --git a/csaxs_bec/devices/panda_box/panda_box.py b/csaxs_bec/devices/panda_box/panda_box.py
index 6c6d811..f7b8271 100644
--- a/csaxs_bec/devices/panda_box/panda_box.py
+++ b/csaxs_bec/devices/panda_box/panda_box.py
@@ -47,18 +47,20 @@ class PandaBoxCSAXS(PandaBox):
             finally:
                 self._disarm()
 
+        _check_capture_complete()
+
         # NOTE: This utility class allows to submit a blocking function to a thread and return a status object
         # that can be awaited for. This allows for asynchronous waiting for the capture to complete without blocking
         # the main duty cycle of the device server. The device server knows how to handle the status object (future)
         # and will wait for it to complete.
-        status = self.task_handler.submit_task(_check_capture_complete, run=True)
+        # status = self.task_handler.submit_task(_check_capture_complete, run=True)
 
-        status_panda_state = StatusBase(obj=self)
-        self.add_status_callback(
-            status, success=[PandaState.END, PandaState.DISARMED], failure=[PandaState.READY]
-        )
-        ret_status = status & status_panda_state
-        self.cancel_on_stop(ret_status)
+        # status_panda_state = StatusBase(obj=self)
+        # self.add_status_callback(
+        #     status, success=[PandaState.END, PandaState.DISARMED], failure=[PandaState.READY]
+        # )
+        # ret_status = status & status_panda_state
+        # self.cancel_on_stop(ret_status)
         return ret_status