diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service
index b36d040d00..2bfd79307b 100644
--- a/packages/mediacenter/xbmc/system.d/xbmc.service
+++ b/packages/mediacenter/xbmc/system.d/xbmc.service
@@ -10,6 +10,8 @@ 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"
+# keep KillMode=process unless there is no good reason to switch to cgroup
+KillMode=process
 TimeoutStopSec=10
 Restart=always
 RestartSec=2