diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index d2945ac033..c165d3b560 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -115,7 +115,6 @@ post_install() {
   add_user system x 430 430 "service" "/var/run/connman" "/bin/sh"
   add_group system 430
 
-  enable_service hostname.service
   enable_service loopback.service
   enable_service connman.service
 }
diff --git a/packages/network/connman/system.d/connman.service b/packages/network/connman/system.d/connman.service
index 6b9c7e462f..d40a10cfb0 100644
--- a/packages/network/connman/system.d/connman.service
+++ b/packages/network/connman/system.d/connman.service
@@ -11,6 +11,7 @@ Type=dbus
 BusName=net.connman
 Restart=on-failure
 EnvironmentFile=-/run/openelec/debug/connman.conf
+ExecStartPre=-/bin/sh -c "cat /storage/.cache/hostname > /proc/sys/kernel/hostname &>/dev/null"
 ExecStart=/bin/sh -c ". /usr/lib/connman/connman-setup; exec /usr/sbin/connmand -nr $CONNMAN_MAIN $CONNMAN_DEBUG"
 # send SIGKILL on stop to keep ip configuration
 KillSignal=SIGKILL
diff --git a/packages/network/connman/system.d/hostname.service b/packages/network/connman/system.d/hostname.service
deleted file mode 100644
index c5e5f5b27d..0000000000
--- a/packages/network/connman/system.d/hostname.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Setup Hostname
-DefaultDependencies=no
-After=local-fs.target
-
-ConditionPathExists=/storage/.cache/hostname
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c 'cat /storage/.cache/hostname > /proc/sys/kernel/hostname'
-RemainAfterExit=yes
-
-[Install]
-WantedBy=sysinit.target