diff --git a/debye_bec/devices/nidaq/nidaq.py b/debye_bec/devices/nidaq/nidaq.py
index f560949..8dc0d2e 100644
--- a/debye_bec/devices/nidaq/nidaq.py
+++ b/debye_bec/devices/nidaq/nidaq.py
@@ -632,12 +632,7 @@ class Nidaq(PSIDeviceBase, NidaqControl):
 
         if self.scan_info.msg.scan_name != "nidaq_continuous_scan":
             self.on_stop()
-            timeout = self.timeout_wait_for_signal
-            status = self.wait_for_condition(
-                condition=lambda: self.state.get() == NidaqState.STANDBY,
-                check_stopped=True,
-                timeout=timeout,
-            )
+            status = self.task_handler.submit_task(task=_check_state, task_args=(self,))
         else:
             status = self.task_handler.submit_task(task=_check_state, task_args=(self,))
         return status