diff --git a/device.c b/device.c
index 9a5a5b3..8742b70 100644
--- a/device.c
+++ b/device.c
@@ -448,7 +448,18 @@ void cSatipDevice::CloseDvr(void)
 bool cSatipDevice::HasLock(int timeoutMsP) const
 {
   debug16("%s (%d) [device %d]", __PRETTY_FUNCTION__, timeoutMsP, deviceIndexM);
-  return (pTunerM && pTunerM->HasLock());
+  if (timeoutMsP <= 0)
+     return (pTunerM && pTunerM->HasLock());
+  else {
+     const int intervalMs = 100;
+
+     for (int t = 0; t < timeoutMsP; t += intervalMs) {
+         if (HasLock(0))
+            return true;
+         cCondWait::SleepMs(intervalMs);
+         }
+     return HasLock(0);
+     }
 }
 
 bool cSatipDevice::HasInternalCam(void)