diff --git a/packages/mediacenter/kodi/config/network_wait b/packages/mediacenter/kodi/config/network_wait
new file mode 100644
index 0000000000..c796cb1af4
--- /dev/null
+++ b/packages/mediacenter/kodi/config/network_wait
@@ -0,0 +1,3 @@
+WAIT_NETWORK="true"
+WAIT_NETWORK_TIME="10"
+WAIT_NETWORK_DEFAULT="true"
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index f88610ddca..5b9bdd7ca3 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -315,6 +315,9 @@ post_makeinstall_target() {
                                 $PROJECT_DIR/$PROJECT/devices/$DEVICE/kodi/appliance.xml \
                                 > $INSTALL/usr/share/kodi/system/settings/appliance.xml
 
+  mkdir -p $INSTALL/usr/cache/libreelec
+    cp $PKG_DIR/config/network_wait $INSTALL/usr/cache/libreelec
+
   # update addon manifest
   ADDON_MANIFEST=$INSTALL/usr/share/kodi/system/addon-manifest.xml
   xmlstarlet ed -L -d "/addons/addon[text()='service.xbmc.versioncheck']" $ADDON_MANIFEST
diff --git a/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
index 1c5a15e2c3..66f3fb2c24 100644
--- a/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
+++ b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
@@ -4,8 +4,9 @@ After=connman.service
 Before=network-online.target
 DefaultDependencies=no
 Conflicts=shutdown.target
-ConditionPathExists=/storage/.cache/libreelec/network_wait
+ConditionFileNotEmpty=/storage/.cache/libreelec/network_wait
 ConditionPathExists=!/dev/.kernel_ipconfig
+ConditionPathExists=/storage/.kodi/userdata/addon_data/service.libreelec.settings/oe_settings.xml
 
 [Service]
 Type=oneshot