diff --git a/csaxs_bec/devices/pseudo_devices/bpm.py b/csaxs_bec/devices/pseudo_devices/bpm.py
index 816ca38..4c9079e 100644
--- a/csaxs_bec/devices/pseudo_devices/bpm.py
+++ b/csaxs_bec/devices/pseudo_devices/bpm.py
@@ -84,9 +84,9 @@ class BPM(PSIDeviceBase):
             self._compute_diagonal, left=self.left, top=self.top, right=self.right, bot=self.bot
         )
 
-    def wait_for_connection(self):
+    def wait_for_connection(self, timeout=10):
         for walk in self.walk_signals():
-            walk.item.wait_for_connection()
+            walk.item.wait_for_connection(timeout=timeout)
 
     def _compute_blade_signal(self, signal: Signal) -> float:
         timestamp = time.time()