diff --git a/config/options b/config/options
index 4b461a321a..4f42fc6562 100644
--- a/config/options
+++ b/config/options
@@ -86,6 +86,10 @@ VERBOSE="${VERBOSE:-yes}"
 # directory.
 CCACHE_CACHE_SIZE="10G"
 
+# set addon paths
+ADDON_PATH="$ADDON_VERSION/$ADDON_PROJECT/$TARGET_ARCH"
+ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+
 # read local persistent options from $ROOT if available
 if [ -f "${ROOT}/.libreelec/options" ]; then
   . "${ROOT}/.libreelec/options"
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 9ab2342b5c..09da4785e7 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -195,9 +195,8 @@
 # Addon Server Url
   ADDON_SERVER_URL="https://addons.libreelec.tv"
 
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+# set the default addon project
+  ADDON_PROJECT="${DEVICE:-$PROJECT}"
 
 # Default size of system partition, in MB, eg. 512
   SYSTEM_SIZE=512