diff --git a/jellyfin/rootfs/etc/cont-init.d/01-migrate.sh b/jellyfin/rootfs/etc/cont-init.d/01-migrate.sh
index 5e61c4e8e..e98093b3e 100755
--- a/jellyfin/rootfs/etc/cont-init.d/01-migrate.sh
+++ b/jellyfin/rootfs/etc/cont-init.d/01-migrate.sh
@@ -14,12 +14,6 @@ if [[ "$LOCATION" == "/share/jellyfin" ]] && [ ! -d /share/jellyfin ] && [ -d /h
     fi
 fi
 
-if [ -d /homeassistant/addons_config/jellyfin_migrated ]; then
-  mkdir -p /config/addons_config
-  ln -sf "$LOCATION" /config/addons_config/jellyfin
-  chown -R "$PUID:$PGID" "$LOCATION"
-fi
-
 # Migration to new /config logic
 if [[ "$LOCATION" == "/config/addons_config/"* ]]; then
     bashio::log.warning "Data folder was $LOCATION, it is migrated to /config/data. The previous folder is renamed to _migrated"    
@@ -32,13 +26,19 @@ if [[ "$LOCATION" == "/config/addons_config/"* ]]; then
     bashio::addon.option "data_location" "/config/data"
 fi
 
+# Migrate old folder
 if [[ -d "/homeassistant/addons_config/jellyfin" ]]; then
-    bashio::log.warning "Data folder was found in /config/addons_config/jellyfin, it is migrated to /config/data. The previous folder is renamed to _migrated"
-    mkdir -p /config/data
-    cp -rn "/homeassistant/addons_config/jellyfin/*" /config/data/
+    bashio::log.warning "Data folder was found in /config/addons_config/jellyfin, it is migrated to $LOCATION. The previous folder is renamed to _migrated"
+    mkdir -p "$LOCATION"
+    cp -rn "/homeassistant/addons_config/jellyfin/*" "$LOCATION"/
     mv /homeassistant/addons_config/jellyfin /homeassistant/addons_config/jellyfin_migrated
-    ln -sf /config/data /config/addons_config/jellyfin
-    bashio::addon.option "data_location" "/config/data"
+fi
+
+# Legacy mode
+if [ -d /homeassistant/addons_config/jellyfin_migrated ]; then
+  mkdir -p /config/addons_config
+  ln -sf "$LOCATION" /config/addons_config/jellyfin
+  chown -R "$PUID:$PGID" "$LOCATION"
 fi
 
 # Migrate autoscripts