diff --git a/jellyfin/rootfs/etc/cont-init.d/00-data_location.sh b/jellyfin/rootfs/etc/cont-init.d/00-data_location.sh
index 2c429928d..c644acd7a 100644
--- a/jellyfin/rootfs/etc/cont-init.d/00-data_location.sh
+++ b/jellyfin/rootfs/etc/cont-init.d/00-data_location.sh
@@ -1,8 +1,14 @@
 #!/usr/bin/with-contenv bashio
+
+# Define user
 PUID=$(bashio::config "PUID")
 PGID=$(bashio::config "PGID")
-LOCATION=$(bashio::config 'data_location')
 
+# Check data location
+LOCATION=$(bashio::config 'data_location')
+if [[ "$LOCATION" = "null" || -z "$LOCATION" ]]; then LOCATION=/config/addons_config/${HOSTNAME#*-}; fi
+
+# Set data location
 bashio::log.info "Setting data location to $LOCATION" 
 sed -i "s|/config|$LOCATION|g" /etc/services.d/jellyfin/run
 sed -i "s|/config|$LOCATION|g" /etc/cont-init.d/10-adduser
@@ -12,4 +18,4 @@ echo "Creating $LOCATION"
 mkdir -p "$LOCATION"
 
 bashio::log.info "Setting ownership to $PUID:$PGID" 
-chown "abc":"abc" "$LOCATION"
+chown "$PUID":"$PGID" "$LOCATION"