diff --git a/packages/mediacenter/xbmc/profile.d/03-addons.conf b/packages/mediacenter/xbmc/profile.d/03-addons.conf
index 4deacb9f97..16a8159967 100644
--- a/packages/mediacenter/xbmc/profile.d/03-addons.conf
+++ b/packages/mediacenter/xbmc/profile.d/03-addons.conf
@@ -21,21 +21,20 @@ oe_setup_addon() {
     DEF="/storage/.xbmc/addons/$1/settings-default.xml"
     CUR="/storage/.xbmc/userdata/addon_data/$1/settings.xml"
 
-    # copy defaults
-    if [ -f "$DEF" -a ! -f "$CUR" ] ; then
-      mkdir -p "/storage/.xbmc/userdata/addon_data/$1"
-      cp "$DEF" "$CUR"
-    fi
-
-    # parse config
-    [ -f "$DEF" ] && eval $(cat "$DEF" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d')
-    [ -f "$CUR" ] && eval $(cat "$CUR" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d')
-
     # export some useful variables
     ADDON_DIR="$HOME/.xbmc/addons/$1"
     ADDON_HOME="$HOME/.xbmc/userdata/addon_data/$1"
     ADDON_LOG_FILE="$ADDON_HOME/service.log"
 
     [ ! -d $ADDON_HOME ] && mkdir -p $ADDON_HOME
+
+    # copy defaults
+    if [ -f "$DEF" -a ! -f "$CUR" ] ; then
+      cp "$DEF" "$CUR"
+    fi
+
+    # parse config
+    [ -f "$DEF" ] && eval $(cat "$DEF" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d')
+    [ -f "$CUR" ] && eval $(cat "$CUR" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d')
   fi
 }