diff --git a/device.c b/device.c
index e267ecc..53fe909 100644
--- a/device.c
+++ b/device.c
@@ -448,17 +448,15 @@ void cSatipDevice::CloseDvr(void)
 bool cSatipDevice::HasLock(int timeoutMsP) const
 {
   debug16("%s (%d) [device %d]", __PRETTY_FUNCTION__, timeoutMsP, deviceIndexM);
-  if (timeoutMsP <= 0)
-     return (pTunerM && pTunerM->HasLock());
-
-  cTimeMs timer(timeoutMsP);
-
-  while (!timer.TimedOut()) {
-        if (HasLock(0))
-           return true;
-        cCondWait::SleepMs(100);
-        }
-  return HasLock(0);
+  if (timeoutMsP > 0) {
+     cTimeMs timer(timeoutMsP);
+     while (!timer.TimedOut()) {
+           if (pTunerM && pTunerM->HasLock())
+              return true;
+           cCondWait::SleepMs(100);
+           }
+     }
+  return (pTunerM && pTunerM->HasLock());
 }
 
 bool cSatipDevice::HasInternalCam(void)