diff --git a/ophyd_devices/devices/delay_generator_645.py b/ophyd_devices/devices/delay_generator_645.py
index 3768605..76d894c 100644
--- a/ophyd_devices/devices/delay_generator_645.py
+++ b/ophyd_devices/devices/delay_generator_645.py
@@ -313,10 +313,13 @@ class DelayGenerator(Device):
             if not channel:
                 continue
             if signal in channel.component_names:
-                getattr(channel, signal).set(val).wait()
+                getattr(channel, signal).set(val)
                 continue
             if "io" in channel.component_names and signal in channel.io.component_names:
-                getattr(channel.io, signal).set(val).wait()
+                getattr(channel.io, signal).set(val)
+        self.check_if_ddg_okay(
+            raise_on_error=True
+        )  # Check that DDG did not return an error, raise immediately if it did
 
     def check_if_ddg_okay(self, raise_on_error: bool = False) -> None:
         """