diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 56b17c63f2..9dc48813bc 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -494,7 +494,6 @@ post_install() {
 
   enable_service xbmc-autostart.service
   enable_service xbmc-cleanlogs.service
-  enable_service xbmc-config.service
   enable_service xbmc-hacks.service
   enable_service xbmc-sources.service
   enable_service xbmc-halt.service
diff --git a/packages/mediacenter/xbmc/system.d/xbmc-config.service b/packages/mediacenter/xbmc/system.d/xbmc-config.service
deleted file mode 100644
index cb0f33faf8..0000000000
--- a/packages/mediacenter/xbmc/system.d/xbmc-config.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=XBMC configfile writer
-Before=xbmc.service
-
-[Service]
-Type=oneshot
-Environment=HOME=/storage
-ExecStart=/usr/lib/xbmc/xbmc-config
-RemainAfterExit=yes
-
-[Install]
-WantedBy=xbmc.service
diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service
index 545d31c62e..e611cf0219 100644
--- a/packages/mediacenter/xbmc/system.d/xbmc.service
+++ b/packages/mediacenter/xbmc/system.d/xbmc.service
@@ -9,6 +9,7 @@ Environment=SDL_MOUSE_RELATIVE=0
 Environment=HOME=/storage
 EnvironmentFile=-/run/openelec/xbmc.conf
 EnvironmentFile=-/run/openelec/debug/xbmc.conf
+ExecStartPre=-/usr/lib/xbmc/xbmc-config
 ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG"
 # keep KillMode=process unless there is no good reason to switch to cgroup
 KillMode=process