diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
index aac0b73d3e..f11952d32c 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
@@ -94,9 +94,13 @@ done
 
 # (wait for) at least 1 adapter (xbmc allows to set 0)
 [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
-if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
-  sleep 1
-  continue
+if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
+  while [ true ] ; do
+    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
+      break
+    fi
+    sleep 1
+  done
 fi
 
 if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index a0cb948e98..6dcf33158a 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -161,12 +161,18 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
   # use ". " because of variable export
   . $driver_dvb
 done
+
 # (wait for) at least 1 adapter (xbmc allows to set 0)
 [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
-if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
-  sleep 1
-  continue
+if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
+  while [ true ] ; do
+    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
+      break
+    fi
+    sleep 1
+  done
 fi
+
 check_tmpfs_mount
 fix_config
 eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG &>$LOG_FILE