diff --git a/packages/mediacenter/kodi/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config
index b9586e8534..5844ebc6c0 100755
--- a/packages/mediacenter/kodi/scripts/kodi-config
+++ b/packages/mediacenter/kodi/scripts/kodi-config
@@ -8,6 +8,9 @@ KODI_ROOT=$HOME/.kodi
 
 BOOT_STATE="$(cat $HOME/.config/boot.status 2>/dev/null)"
 
+# May not exist if testing a clean /storage/.kodi without rebooting
+mkdir -p $KODI_ROOT/userdata
+
 # hack: make addon-bins executable
 # done in kodi on addon install. but just in case..
 chmod +x $KODI_ROOT/addons/*/bin/* 2>/dev/null
diff --git a/packages/mediacenter/kodi/tmpfiles.d/kodi-userdirs.conf b/packages/mediacenter/kodi/tmpfiles.d/kodi-userdirs.conf
index d1a0937661..347a94098a 100644
--- a/packages/mediacenter/kodi/tmpfiles.d/kodi-userdirs.conf
+++ b/packages/mediacenter/kodi/tmpfiles.d/kodi-userdirs.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
-d    /storage/.kodi/userdata     0755 root root - -
 d    /storage/music              0755 root root - -
 d    /storage/pictures           0755 root root - -
 d    /storage/tvshows            0755 root root - -