diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service
index 143fcd15be..9c3d66d553 100644
--- a/packages/mediacenter/xbmc/system.d/xbmc.service
+++ b/packages/mediacenter/xbmc/system.d/xbmc.service
@@ -10,7 +10,7 @@ Environment=HOME=/storage
 EnvironmentFile=-/run/openelec/xbmc.conf
 EnvironmentFile=-/run/openelec/debug/xbmc.conf
 ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG"
-KillMode=process
+TimeoutStopSec=10
 Restart=always
 ### TODO: remove this
 RestartSec=1