diff --git a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
index 0cb958058d..71317cd4ce 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
@@ -1,4 +1,5 @@
 <settings>
+    <setting id="WAIT_FOR_FEINIT" value="false" />
     <setting id="XMLTV_LOCATION_FILE" value="" />
     <setting id="XMLTV_LOCATION_WEB" value="http://" />
     <setting id="XMLTV_TYPE" value="NONE" />
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
index ae69147e6c..796369e49e 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
@@ -54,6 +54,14 @@ fi
 
 TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 
+mkdir -p /var/config
+cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
+cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
+
+. /var/config/tvheadend.conf.default
+. /var/config/tvheadend.conf
+
+
 mkdir -p $ADDON_HOME
   if [ ! "$(pidof $ADDON_BIN)" ]; then
     # start userspace DVB driver/addon
@@ -72,6 +80,10 @@ mkdir -p $ADDON_HOME
       if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
         break
       fi
+      if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+        sleep 1
+        continue
+      fi
       $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
     done &
   fi
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
index 92b655ff1a..3b6c054e15 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
@@ -10,5 +10,6 @@
 	<string id="1013">XMLTV Web location</string>
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
+	<string id="1022">Wait for frontend initialization</string>
 
 </strings>
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
index 12666cf0dd..59ff7fde8b 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
@@ -12,6 +12,7 @@
     <category label="1001">
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
+		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
 </settings>