diff --git a/alarm/kodi-rbp4/PKGBUILD b/alarm/kodi-rbp4/PKGBUILD
index 3121c9a60..c591b434f 100644
--- a/alarm/kodi-rbp4/PKGBUILD
+++ b/alarm/kodi-rbp4/PKGBUILD
@@ -26,7 +26,7 @@ _prefix=/usr
 pkgbase=kodi-rbp4
 pkgname=('kodi-rbp4' 'kodi-rbp4-eventclients' 'kodi-rbp4-tools-texturepacker' 'kodi-rbp4-dev')
 pkgver=18.9
-pkgrel=2
+pkgrel=3
 _codename=Leia
 _ffmpeg_version="4.2.2-Matrix-Alpha1"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
@@ -85,7 +85,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
 sha256sums=('9a17ae7ff4ab036539ebd19223b65974fd4b0e5c2bb3eea96674efa6ee2fb22b'
-            '2195262629b156fdc0d4cae79acbc77438897b2a764017b7553193effc43cf3b'
+            'edcdec15545cb2e54b7ce9e96c1fb055917783ced5f9f5d8af4848feed302e29'
             '8e14cf455898246d11edd4ff7f4ed11a44c729fb40c34455a5b336a90ccc1f7b'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
             '0dba571f9809588cfbdc29d6a551dab4cd5736701653d9263847c9ac67bcde86'
diff --git a/alarm/kodi-rbp4/kodi.service b/alarm/kodi-rbp4/kodi.service
index b8e2b7fa3..bb5f2291b 100644
--- a/alarm/kodi-rbp4/kodi.service
+++ b/alarm/kodi-rbp4/kodi.service
@@ -10,7 +10,8 @@ Group=kodi
 PAMName=login
 TTYPath=/dev/tty1
 Environment=WINDOWING=gbm
-ExecStart=/usr/lib/kodi/kodi-gbm --standalone
+ExecStart=/usr/bin/kodi-standalone --standalone
+ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-gbm
 Restart=on-abort
 StandardInput=tty
 StandardOutput=journal