diff --git a/src/lib/Library.svelte b/src/lib/Library.svelte
index 1b93a6e..1b6423d 100644
--- a/src/lib/Library.svelte
+++ b/src/lib/Library.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { Snippet } from "svelte";
-import { auth, isOwner, lib, t, ui } from "./app.svelte.js";
+import { auth, isOwner, lib, settings, t, ui } from "./app.svelte.js";
 import {
 	type AlbumListParams,
 	type AlbumListType,
@@ -228,7 +228,11 @@ function onKey(event: KeyboardEvent) {
 	<ul class="tree">
 		{#if !offlineManager.online}
 			<li class="status">
-				{t("offline.offline_notice")}
+				{t(
+					settings.downloadsAutoSyncMode === "none"
+						? "offline.offline_notice"
+						: "offline.offline_notice_auto_sync",
+				)}
 			</li>
 		{/if}
 		{#if offlineManager.downloadProgress.downloading}
diff --git a/src/lib/Queue.svelte b/src/lib/Queue.svelte
index 679931b..afc3fb0 100644
--- a/src/lib/Queue.svelte
+++ b/src/lib/Queue.svelte
@@ -217,9 +217,9 @@ $effect(() => {
 });
 
 $effect(() => {
-	const request = queue.scrollRequest;
-	if (request && scrollToIndex) {
-		scrollToIndex(request.index, request.behavior);
+	const scrollRequest = queue.scrollRequest;
+	if (scrollRequest && scrollToIndex) {
+		scrollToIndex(scrollRequest.index, scrollRequest.behavior);
 		untrack(() => {
 			queue.scrollRequest = null;
 		});
diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts
index 92ad362..f701277 100644
--- a/src/lib/auth.svelte.ts
+++ b/src/lib/auth.svelte.ts
@@ -134,6 +134,7 @@ export const isOwner = (owner?: string | null) =>
 export const reconnectSession = async () => {
 	try {
 		await detectExtensions();
+		await offlineManager.autoSyncQueuedRequests();
 		auth.admin = await loadSessionData(auth.user);
 	} catch (err) {
 		console.error("failed to reconnect session:", err);
diff --git a/src/lib/dialogs/SettingsModal.svelte b/src/lib/dialogs/SettingsModal.svelte
index 13a3a2c..f579fd9 100644
--- a/src/lib/dialogs/SettingsModal.svelte
+++ b/src/lib/dialogs/SettingsModal.svelte
@@ -58,6 +58,7 @@ async function handleDownloadsToggle(event: Event) {
 	try {
 		settings.downloads = false;
 		settings.downloadsAuto = false;
+		settings.downloadsAutoSyncMode = "none";
 
 		if (player.track && offlineAudios.has(player.track.id)) {
 			await load(player.track, player.time, !player.paused);
@@ -602,6 +603,14 @@ const columnSettings = [
 								>{offlineManager.downloadedPlaylistIds.size}
 							</span>
 						</div>
+						<div class="row">
+							<span>{t("settings.auto_sync")}</span>
+							<select bind:value={settings.downloadsAutoSyncMode}>
+								<option value="none">{t("common.none")}</option>
+								<option value="scrobbles">{t("settings.auto_sync_scrobbles")}</option>
+								<option value="all">{t("settings.auto_sync_all")}</option>
+							</select>
+						</div>
 						<div class="row">
 							<span>{t("settings.auto_download")}</span>
 							<input
diff --git a/src/lib/languages/locales/ar.ts b/src/lib/languages/locales/ar.ts
index ef6c5d7..597a4c0 100644
--- a/src/lib/languages/locales/ar.ts
+++ b/src/lib/languages/locales/ar.ts
@@ -150,6 +150,8 @@ const ar: BaseDict = {
 		no_changes: "لا توجد تغييرات معلقة.",
 		offline_notice:
 			"أنت غير متصل! ستحتاج إلى مزامنة التغييرات يدويًا بمجرد عودتك للاتصال.",
+		offline_notice_auto_sync:
+			"أنت غير متصل! ستتم مزامنة التغييرات المحددة تلقائيًا بمجرد عودتك للاتصال.",
 		rate: 'قيّم {rating} نجوم: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "استخدام التخزين",
@@ -165,6 +167,9 @@ const ar: BaseDict = {
 	settings: {
 		appearance: "المظهر",
 		artwork_sizes: "أحجام الأغلفة",
+		auto_sync: "المزامنة التلقائية",
+		auto_sync_all: "الكل",
+		auto_sync_scrobbles: "سكروبلات",
 		auto_download: "التنزيل التلقائي",
 		auto_download_songs: "أغاني",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/bn.ts b/src/lib/languages/locales/bn.ts
index 497e100..403c667 100644
--- a/src/lib/languages/locales/bn.ts
+++ b/src/lib/languages/locales/bn.ts
@@ -150,6 +150,8 @@ const bn: BaseDict = {
 		no_changes: "কোনো মুলতুবি পরিবর্তন নেই।",
 		offline_notice:
 			"আপনি অফলাইনে আছেন! অনলাইনে ফিরলে পরিবর্তনগুলি আপনাকে হাতে সিঙ্ক করতে হবে।",
+		offline_notice_auto_sync:
+			"আপনি অফলাইনে আছেন! অনলাইনে ফিরলেই নির্বাচিত পরিবর্তনগুলি স্বয়ংক্রিয়ভাবে সিঙ্ক হবে।",
 		rate: '{rating} তারকা রেট দিন: "{title}"',
 		scrobble: 'স্ক্রবল: "{title}"',
 		storage_usage: "স্টোরেজ ব্যবহার",
@@ -165,6 +167,9 @@ const bn: BaseDict = {
 	settings: {
 		appearance: "বাহ্যিক রূপ",
 		artwork_sizes: "আর্টওয়ার্কের আকার",
+		auto_sync: "স্বয়ংক্রিয় সিঙ্ক",
+		auto_sync_all: "সব",
+		auto_sync_scrobbles: "স্ক্রবল",
 		auto_download: "অটো ডাউনলোড",
 		auto_download_songs: "গান",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/cs.ts b/src/lib/languages/locales/cs.ts
index 6c802a2..f855e8f 100644
--- a/src/lib/languages/locales/cs.ts
+++ b/src/lib/languages/locales/cs.ts
@@ -150,6 +150,8 @@ const cs: BaseDict = {
 		no_changes: "Žádné nevyřízené změny.",
 		offline_notice:
 			"Jste offline! Jakmile budete online, budete muset změny synchronizovat ručně.",
+		offline_notice_auto_sync:
+			"Jste offline! Vybrané změny se automaticky synchronizují, jakmile budete opět online.",
 		rate: 'Hodnocení {rating} hvězdiček: "{title}“',
 		scrobble: 'Scrobble: "{title}“',
 		storage_usage: "Využití úložiště",
@@ -165,6 +167,9 @@ const cs: BaseDict = {
 	settings: {
 		appearance: "Vzhled",
 		artwork_sizes: "Velikosti obalů",
+		auto_sync: "Automatická synchronizace",
+		auto_sync_all: "Vše",
+		auto_sync_scrobbles: "Scrobbly",
 		auto_download: "Automatické stahování",
 		auto_download_songs: "Písně",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/da.ts b/src/lib/languages/locales/da.ts
index de42ea6..197aa4a 100644
--- a/src/lib/languages/locales/da.ts
+++ b/src/lib/languages/locales/da.ts
@@ -150,6 +150,8 @@ const da: BaseDict = {
 		no_changes: "Ingen ventende ændringer.",
 		offline_notice:
 			"Du er offline! Du skal synkronisere ændringer manuelt, når du er online igen.",
+		offline_notice_auto_sync:
+			"Du er offline! De valgte ændringer synkroniseres automatisk, når du er online igen.",
 		rate: 'Bedøm {rating} stjerner: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Opbevaringsbrug",
@@ -165,6 +167,9 @@ const da: BaseDict = {
 	settings: {
 		appearance: "Udseende",
 		artwork_sizes: "Omslagsstørrelser",
+		auto_sync: "Automatisk synkronisering",
+		auto_sync_all: "Alle",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Automatisk download",
 		auto_download_songs: "Sange",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/de.ts b/src/lib/languages/locales/de.ts
index 5821845..d3d0fe4 100644
--- a/src/lib/languages/locales/de.ts
+++ b/src/lib/languages/locales/de.ts
@@ -150,6 +150,8 @@ const de: BaseDict = {
 		no_changes: "Keine ausstehenden Änderungen.",
 		offline_notice:
 			"Sie sind offline! Sobald Sie wieder online sind, müssen Sie Änderungen manuell synchronisieren.",
+		offline_notice_auto_sync:
+			"Sie sind offline! Ausgewählte Änderungen werden automatisch synchronisiert, sobald Sie wieder online sind.",
 		rate: '{rating} Sterne bewerten: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Speicherplatzbelegung",
@@ -165,6 +167,9 @@ const de: BaseDict = {
 	settings: {
 		appearance: "Erscheinungsbild",
 		artwork_sizes: "Cover-Größen",
+		auto_sync: "Automatische Synchronisierung",
+		auto_sync_all: "Alle",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Automatischer Download",
 		auto_download_songs: "Songs",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/el.ts b/src/lib/languages/locales/el.ts
index 87f70c1..1d1b018 100644
--- a/src/lib/languages/locales/el.ts
+++ b/src/lib/languages/locales/el.ts
@@ -151,6 +151,8 @@ const el: BaseDict = {
 		no_changes: "Δεν υπάρχουν εκκρεμείς αλλαγές.",
 		offline_notice:
 			"Είστε εκτός σύνδεσης! Θα πρέπει να συγχρονίσετε τις αλλαγές χειροκίνητα όταν συνδεθείτε ξανά.",
+		offline_notice_auto_sync:
+			"Είστε εκτός σύνδεσης! Οι επιλεγμένες αλλαγές θα συγχρονιστούν αυτόματα μόλις συνδεθείτε ξανά.",
 		rate: 'Βαθμολόγηση {rating} αστέρων: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Χρήση αποθήκευσης",
@@ -166,6 +168,9 @@ const el: BaseDict = {
 	settings: {
 		appearance: "Εμφάνιση",
 		artwork_sizes: "Μεγέθη εξωφύλλων",
+		auto_sync: "Αυτόματος συγχρονισμός",
+		auto_sync_all: "Όλα",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Αυτόματη λήψη",
 		auto_download_songs: "Τραγούδια",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/en.ts b/src/lib/languages/locales/en.ts
index e9f5b54..bbb48a7 100644
--- a/src/lib/languages/locales/en.ts
+++ b/src/lib/languages/locales/en.ts
@@ -148,6 +148,8 @@ const en = {
 		no_changes: "No pending changes.",
 		offline_notice:
 			"You're offline! You will need to manually sync changes once online.",
+		offline_notice_auto_sync:
+			"You're offline! Selected changes will sync automatically once online.",
 		rate: 'Rate {rating} stars: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Storage Usage",
@@ -163,6 +165,9 @@ const en = {
 	settings: {
 		appearance: "Appearance",
 		artwork_sizes: "Artwork Sizes",
+		auto_sync: "Auto Sync",
+		auto_sync_all: "All",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Auto Download",
 		auto_download_songs: "Songs",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/es.ts b/src/lib/languages/locales/es.ts
index 397f098..a36628a 100644
--- a/src/lib/languages/locales/es.ts
+++ b/src/lib/languages/locales/es.ts
@@ -150,6 +150,8 @@ const es: BaseDict = {
 		no_changes: "No hay cambios pendientes.",
 		offline_notice:
 			"¡Estás sin conexión! Tendrás que sincronizar los cambios manualmente cuando vuelvas a estar en línea.",
+		offline_notice_auto_sync:
+			"¡Estás sin conexión! Los cambios seleccionados se sincronizarán automáticamente cuando vuelvas a estar en línea.",
 		rate: 'Puntuar {rating} estrellas: "{title}"',
 		scrobble: 'Hacer scrobble: "{title}"',
 		storage_usage: "Uso de almacenamiento",
@@ -165,6 +167,9 @@ const es: BaseDict = {
 	settings: {
 		appearance: "Apariencia",
 		artwork_sizes: "Tamaño de carátulas",
+		auto_sync: "Sincronización automática",
+		auto_sync_all: "Todo",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Descarga automática",
 		auto_download_songs: "Canciones",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/fi.ts b/src/lib/languages/locales/fi.ts
index 153d3fb..2e7676c 100644
--- a/src/lib/languages/locales/fi.ts
+++ b/src/lib/languages/locales/fi.ts
@@ -151,6 +151,8 @@ const fi: BaseDict = {
 		no_changes: "Ei odottavia muutoksia.",
 		offline_notice:
 			"Olet offline-tilassa! Muutokset on synkronoitava käsin, kun olet jälleen verkossa.",
+		offline_notice_auto_sync:
+			"Olet offline-tilassa! Valitut muutokset synkronoidaan automaattisesti, kun olet jälleen verkossa.",
 		rate: 'Arvioi {rating} tähdellä: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Varastoinnin käyttö",
@@ -166,6 +168,9 @@ const fi: BaseDict = {
 	settings: {
 		appearance: "Ulkoasu",
 		artwork_sizes: "Kansikuvan koot",
+		auto_sync: "Automaattinen synkronointi",
+		auto_sync_all: "Kaikki",
+		auto_sync_scrobbles: "Scrobbaukset",
 		auto_download: "Automaattinen lataus",
 		auto_download_songs: "Songs",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/fr.ts b/src/lib/languages/locales/fr.ts
index ea39e07..1e26e73 100644
--- a/src/lib/languages/locales/fr.ts
+++ b/src/lib/languages/locales/fr.ts
@@ -150,6 +150,8 @@ const fr: BaseDict = {
 		no_changes: "Aucune modification en attente.",
 		offline_notice:
 			"Vous êtes hors ligne ! Vous devrez synchroniser les modifications manuellement une fois reconnecté.",
+		offline_notice_auto_sync:
+			"Vous êtes hors ligne ! Les modifications sélectionnées seront synchronisées automatiquement dès le retour en ligne.",
 		rate: 'Noter {rating} étoiles : "{title}"',
 		scrobble: 'Scrobbler : "{title}"',
 		storage_usage: "Espace de stockage utilisé",
@@ -165,6 +167,9 @@ const fr: BaseDict = {
 	settings: {
 		appearance: "Apparence",
 		artwork_sizes: "Taille des pochettes",
+		auto_sync: "Synchronisation automatique",
+		auto_sync_all: "Tout",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Téléchargement automatique",
 		auto_download_songs: "Morceaux",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/he.ts b/src/lib/languages/locales/he.ts
index 84eec63..cec19d0 100644
--- a/src/lib/languages/locales/he.ts
+++ b/src/lib/languages/locales/he.ts
@@ -150,6 +150,8 @@ const he: BaseDict = {
 		no_changes: "אין שינויים ממתינים.",
 		offline_notice:
 			"אתה במצב לא מקוון! יהיה עליך לסנכרן שינויים ידנית כשתתחבר שוב.",
+		offline_notice_auto_sync:
+			"אין חיבור לרשת! השינויים שנבחרו יסונכרנו אוטומטית כשהחיבור יחודש.",
 		rate: 'דרג {rating} כוכבים: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "שימוש באחסון",
@@ -165,6 +167,9 @@ const he: BaseDict = {
 	settings: {
 		appearance: "מראה",
 		artwork_sizes: "גודל עטיפות",
+		auto_sync: "סנכרון אוטומטי",
+		auto_sync_all: "הכול",
+		auto_sync_scrobbles: "סקרובלים",
 		auto_download: "הורדה אוטומטית",
 		auto_download_songs: "שירים",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/hi.ts b/src/lib/languages/locales/hi.ts
index 565d5fc..fcfac56 100644
--- a/src/lib/languages/locales/hi.ts
+++ b/src/lib/languages/locales/hi.ts
@@ -149,6 +149,8 @@ const hi: BaseDict = {
 		no_changes: "कोई लंबित बदलाव नहीं।",
 		offline_notice:
 			"आप ऑफ़लाइन हैं! ऑनलाइन होने पर आपको बदलावों को मैन्युअल रूप से सिंक करना होगा।",
+		offline_notice_auto_sync:
+			"आप ऑफ़लाइन हैं! चुने गए बदलाव ऑनलाइन होते ही अपने-आप सिंक हो जाएँगे।",
 		rate: '{rating} स्टार रेटिंग: "{title}"',
 		scrobble: 'स्क्रोबल: "{title}"',
 		storage_usage: "भंडारण उपयोग",
@@ -164,6 +166,9 @@ const hi: BaseDict = {
 	settings: {
 		appearance: "रूप-रंग",
 		artwork_sizes: "आर्टवर्क का आकार",
+		auto_sync: "स्वतः सिंक",
+		auto_sync_all: "सभी",
+		auto_sync_scrobbles: "स्क्रोबल",
 		auto_download: "स्वतः डाउनलोड",
 		auto_download_songs: "गाने",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/id.ts b/src/lib/languages/locales/id.ts
index 35b7628..73941a6 100644
--- a/src/lib/languages/locales/id.ts
+++ b/src/lib/languages/locales/id.ts
@@ -150,6 +150,8 @@ const id: BaseDict = {
 		no_changes: "Tidak ada perubahan tertunda.",
 		offline_notice:
 			"Anda sedang offline! Anda perlu menyinkronkan perubahan secara manual setelah online lagi.",
+		offline_notice_auto_sync:
+			"Anda sedang offline! Perubahan yang dipilih akan disinkronkan secara otomatis setelah Anda online lagi.",
 		rate: 'Beri rating {rating} bintang: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Penggunaan Penyimpanan",
@@ -165,6 +167,9 @@ const id: BaseDict = {
 	settings: {
 		appearance: "Tampilan",
 		artwork_sizes: "Ukuran gambar",
+		auto_sync: "Sinkronisasi Otomatis",
+		auto_sync_all: "Semua",
+		auto_sync_scrobbles: "Scrobble",
 		auto_download: "Unduh Otomatis",
 		auto_download_songs: "Lagu",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/it.ts b/src/lib/languages/locales/it.ts
index 5ba8822..953263e 100644
--- a/src/lib/languages/locales/it.ts
+++ b/src/lib/languages/locales/it.ts
@@ -150,6 +150,8 @@ const it: BaseDict = {
 		no_changes: "Nessuna modifica in sospeso.",
 		offline_notice:
 			"Sei offline! Dovrai sincronizzare manualmente le modifiche quando tornerai online.",
+		offline_notice_auto_sync:
+			"Sei offline! Le modifiche selezionate verranno sincronizzate automaticamente quando tornerai online.",
 		rate: 'Valuta {rating} stelle: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Spazio di archiviazione utilizzato",
@@ -165,6 +167,9 @@ const it: BaseDict = {
 	settings: {
 		appearance: "Aspetto",
 		artwork_sizes: "Dimensioni copertine",
+		auto_sync: "Sincronizzazione automatica",
+		auto_sync_all: "Tutte",
+		auto_sync_scrobbles: "Scrobble",
 		auto_download: "Download automatico",
 		auto_download_songs: "Brani",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/ja.ts b/src/lib/languages/locales/ja.ts
index 005bebc..a543ed0 100644
--- a/src/lib/languages/locales/ja.ts
+++ b/src/lib/languages/locales/ja.ts
@@ -150,6 +150,8 @@ const ja: BaseDict = {
 		no_changes: "保留中の変更はありません。",
 		offline_notice:
 			"オフラインです。オンラインに戻ったら変更を手動で同期する必要があります。",
+		offline_notice_auto_sync:
+			"オフラインです！選択した変更は、オンラインに戻ると自動的に同期されます。",
 		rate: "{rating}つ星で評価: 「{title}」",
 		scrobble: "スクロブル: 「{title}」",
 		storage_usage: "ストレージの使用量",
@@ -165,6 +167,9 @@ const ja: BaseDict = {
 	settings: {
 		appearance: "外観",
 		artwork_sizes: "アートワークのサイズ",
+		auto_sync: "自動同期",
+		auto_sync_all: "すべて",
+		auto_sync_scrobbles: "スクロブル",
 		auto_download: "自動ダウンロード",
 		auto_download_songs: "歌",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/ko.ts b/src/lib/languages/locales/ko.ts
index 12a40ad..f8e1dff 100644
--- a/src/lib/languages/locales/ko.ts
+++ b/src/lib/languages/locales/ko.ts
@@ -149,6 +149,8 @@ const ko: BaseDict = {
 		no_changes: "대기 중인 변경 사항이 없습니다.",
 		offline_notice:
 			"오프라인 상태입니다! 다시 온라인이 되면 변경 사항을 수동으로 동기화해야 합니다.",
+		offline_notice_auto_sync:
+			"오프라인 상태입니다! 선택한 변경 사항은 다시 온라인이 되면 자동으로 동기화됩니다.",
 		rate: '{rating}점 평가: "{title}"',
 		scrobble: '스크로블: "{title}"',
 		storage_usage: "스토리지 사용량",
@@ -164,6 +166,9 @@ const ko: BaseDict = {
 	settings: {
 		appearance: "외관",
 		artwork_sizes: "앨범 아트 크기",
+		auto_sync: "자동 동기화",
+		auto_sync_all: "모두",
+		auto_sync_scrobbles: "스크로블",
 		auto_download: "자동 다운로드",
 		auto_download_songs: "노래",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/nl.ts b/src/lib/languages/locales/nl.ts
index 3a36436..1aeb141 100644
--- a/src/lib/languages/locales/nl.ts
+++ b/src/lib/languages/locales/nl.ts
@@ -151,6 +151,8 @@ const nl: BaseDict = {
 		no_changes: "Geen openstaande wijzigingen.",
 		offline_notice:
 			"Je bent offline! Zodra je weer online bent, moet je wijzigingen handmatig synchroniseren.",
+		offline_notice_auto_sync:
+			"Je bent offline! Geselecteerde wijzigingen worden automatisch gesynchroniseerd zodra je weer online bent.",
 		rate: 'Beoordeel {rating} sterren: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Opslaggebruik",
@@ -166,6 +168,9 @@ const nl: BaseDict = {
 	settings: {
 		appearance: "Uiterlijk",
 		artwork_sizes: "Grootte albumhoezen",
+		auto_sync: "Automatisch synchroniseren",
+		auto_sync_all: "Alles",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Automatisch downloaden",
 		auto_download_songs: "Nummers",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/no.ts b/src/lib/languages/locales/no.ts
index a9202b2..d8dc9f8 100644
--- a/src/lib/languages/locales/no.ts
+++ b/src/lib/languages/locales/no.ts
@@ -150,6 +150,8 @@ const no: BaseDict = {
 		no_changes: "Ingen ventende endringer.",
 		offline_notice:
 			"Du er frakoblet! Du må synkronisere endringene manuelt når du er på nett igjen.",
+		offline_notice_auto_sync:
+			"Du er frakoblet! Valgte endringer synkroniseres automatisk når du er på nett igjen.",
 		rate: "Gi {rating} stjerner: «{title}»",
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Lagringsbruk",
@@ -165,6 +167,9 @@ const no: BaseDict = {
 	settings: {
 		appearance: "Utseende",
 		artwork_sizes: "Størrelse på omslag",
+		auto_sync: "Automatisk synkronisering",
+		auto_sync_all: "Alle",
+		auto_sync_scrobbles: "Scrobbles",
 		auto_download: "Automatisk nedlasting",
 		auto_download_songs: "Sanger",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/pl.ts b/src/lib/languages/locales/pl.ts
index 621f532..72b1fcf 100644
--- a/src/lib/languages/locales/pl.ts
+++ b/src/lib/languages/locales/pl.ts
@@ -150,6 +150,8 @@ const pl: BaseDict = {
 		no_changes: "Brak oczekujących zmian.",
 		offline_notice:
 			"Jesteś offline! Po powrocie do sieci trzeba będzie ręcznie zsynchronizować zmiany.",
+		offline_notice_auto_sync:
+			"Jesteś offline! Wybrane zmiany zostaną automatycznie zsynchronizowane po powrocie do sieci.",
 		rate: 'Oceń na {rating} gwiazdek: "{title}”',
 		scrobble: 'Scrobble: "{title}”',
 		storage_usage: "Wykorzystanie pamięci",
@@ -165,6 +167,9 @@ const pl: BaseDict = {
 	settings: {
 		appearance: "Wygląd",
 		artwork_sizes: "Rozmiary okładek",
+		auto_sync: "Automatyczna synchronizacja",
+		auto_sync_all: "Wszystkie",
+		auto_sync_scrobbles: "Scrobble",
 		auto_download: "Automatyczne pobieranie",
 		auto_download_songs: "Piosenki",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/pt.ts b/src/lib/languages/locales/pt.ts
index 26e48b5..689314c 100644
--- a/src/lib/languages/locales/pt.ts
+++ b/src/lib/languages/locales/pt.ts
@@ -150,6 +150,8 @@ const pt: BaseDict = {
 		no_changes: "Nenhuma alteração pendente.",
 		offline_notice:
 			"Está offline! Terá de sincronizar manualmente as alterações quando voltar a estar online.",
+		offline_notice_auto_sync:
+			"Está offline! As alterações selecionadas serão sincronizadas automaticamente assim que voltar a estar online.",
 		rate: 'Avaliar {rating} estrelas: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Uso de armazenamento",
@@ -165,6 +167,9 @@ const pt: BaseDict = {
 	settings: {
 		appearance: "Aparência",
 		artwork_sizes: "Tamanho das capas",
+		auto_sync: "Sincronização automática",
+		auto_sync_all: "Todas",
+		auto_sync_scrobbles: "Registos de reprodução",
 		auto_download: "Download automático",
 		auto_download_songs: "Músicas",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/ro.ts b/src/lib/languages/locales/ro.ts
index 2ac425a..cce9af6 100644
--- a/src/lib/languages/locales/ro.ts
+++ b/src/lib/languages/locales/ro.ts
@@ -150,6 +150,8 @@ const ro: BaseDict = {
 		no_changes: "Nu există modificări în așteptare.",
 		offline_notice:
 			"Ești offline! Va trebui să sincronizezi manual modificările după ce revii online.",
+		offline_notice_auto_sync:
+			"Ești offline! Modificările selectate se vor sincroniza automat când revii online.",
 		rate: 'Evaluează {rating} stele: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Utilizarea depozitării",
@@ -165,6 +167,9 @@ const ro: BaseDict = {
 	settings: {
 		appearance: "Aspect",
 		artwork_sizes: "Dimensiuni coperți",
+		auto_sync: "Sincronizare automată",
+		auto_sync_all: "Toate",
+		auto_sync_scrobbles: "Scrobble-uri",
 		auto_download: "Descărcare automată",
 		auto_download_songs: "Cântece",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/ru.ts b/src/lib/languages/locales/ru.ts
index 086676d..4c8f4cb 100644
--- a/src/lib/languages/locales/ru.ts
+++ b/src/lib/languages/locales/ru.ts
@@ -150,6 +150,8 @@ const ru: BaseDict = {
 		no_changes: "Нет ожидающих изменений.",
 		offline_notice:
 			"Вы не в сети! Когда снова появится подключение, изменения нужно будет синхронизировать вручную.",
+		offline_notice_auto_sync:
+			"Вы не в сети! Выбранные изменения будут автоматически синхронизированы после подключения к сети.",
 		rate: 'Оценить на {rating} звезды: "{title}"',
 		scrobble: 'Скроббл: "{title}"',
 		storage_usage: "Использование хранилища",
@@ -165,6 +167,9 @@ const ru: BaseDict = {
 	settings: {
 		appearance: "Внешний вид",
 		artwork_sizes: "Размер обложек",
+		auto_sync: "Автосинхронизация",
+		auto_sync_all: "Всё",
+		auto_sync_scrobbles: "Скробблы",
 		auto_download: "Автоматическая загрузка",
 		auto_download_songs: "Песни",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/sv.ts b/src/lib/languages/locales/sv.ts
index 49b3e05..80f6a27 100644
--- a/src/lib/languages/locales/sv.ts
+++ b/src/lib/languages/locales/sv.ts
@@ -150,6 +150,8 @@ const sv: BaseDict = {
 		no_changes: "Inga väntande ändringar.",
 		offline_notice:
 			"Du är offline! Du måste synkronisera ändringar manuellt när du är online igen.",
+		offline_notice_auto_sync:
+			"Du är offline! Valda ändringar synkroniseras automatiskt när du är online igen.",
 		rate: 'Betygsätt {rating} stjärnor: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Användning av lagring",
@@ -165,6 +167,9 @@ const sv: BaseDict = {
 	settings: {
 		appearance: "Utseende",
 		artwork_sizes: "Storlek på omslag",
+		auto_sync: "Automatisk synkronisering",
+		auto_sync_all: "Alla",
+		auto_sync_scrobbles: "Skrobblingar",
 		auto_download: "Automatisk nedladdning",
 		auto_download_songs: "Låtar",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/th.ts b/src/lib/languages/locales/th.ts
index e2c9a8b..ce38321 100644
--- a/src/lib/languages/locales/th.ts
+++ b/src/lib/languages/locales/th.ts
@@ -149,6 +149,8 @@ const th: BaseDict = {
 		no_changes: "ไม่มีการเปลี่ยนแปลงที่รอดำเนินการ",
 		offline_notice:
 			"คุณออฟไลน์อยู่! เมื่อกลับมาออนไลน์แล้ว คุณจะต้องซิงก์การเปลี่ยนแปลงด้วยตนเอง",
+		offline_notice_auto_sync:
+			"คุณออฟไลน์อยู่! การเปลี่ยนแปลงที่เลือกจะซิงก์โดยอัตโนมัติเมื่อกลับมาออนไลน์",
 		rate: 'ให้คะแนน {rating} ดาว: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "การใช้พื้นที่เก็บข้อมูล",
@@ -164,6 +166,9 @@ const th: BaseDict = {
 	settings: {
 		appearance: "รูปลักษณ์",
 		artwork_sizes: "ขนาดรูปหน้าปก",
+		auto_sync: "ซิงก์อัตโนมัติ",
+		auto_sync_all: "ทั้งหมด",
+		auto_sync_scrobbles: "สครอบเบิล",
 		auto_download: "ดาวน์โหลดอัตโนมัติ",
 		auto_download_songs: "เพลง",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/tl.ts b/src/lib/languages/locales/tl.ts
index 998e677..7ce8a75 100644
--- a/src/lib/languages/locales/tl.ts
+++ b/src/lib/languages/locales/tl.ts
@@ -150,6 +150,8 @@ const tl: BaseDict = {
 		no_changes: "Walang nakabinbing pagbabago.",
 		offline_notice:
 			"Offline ka! Kakailanganin mong i-sync nang manu-mano ang mga pagbabago kapag online ka na muli.",
+		offline_notice_auto_sync:
+			"Offline ka! Awtomatikong isi-sync ang mga napiling pagbabago kapag online ka na.",
 		rate: 'I-rate ng {rating} bituin: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Paggamit ng Imbakan",
@@ -165,6 +167,9 @@ const tl: BaseDict = {
 	settings: {
 		appearance: "Itsura",
 		artwork_sizes: "Mga sukat ng artwork",
+		auto_sync: "Awtomatikong pag-sync",
+		auto_sync_all: "Lahat",
+		auto_sync_scrobbles: "Mga scrobble",
 		auto_download: "Auto Download",
 		auto_download_songs: "Mga kanta",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/tr.ts b/src/lib/languages/locales/tr.ts
index 4b31922..2f0ab97 100644
--- a/src/lib/languages/locales/tr.ts
+++ b/src/lib/languages/locales/tr.ts
@@ -150,6 +150,8 @@ const tr: BaseDict = {
 		no_changes: "Bekleyen değişiklik yok.",
 		offline_notice:
 			"Çevrimdışısınız! Yeniden çevrimiçi olduğunuzda değişiklikleri elle senkronize etmeniz gerekecek.",
+		offline_notice_auto_sync:
+			"Çevrimdışısınız! Seçili değişiklikler yeniden çevrimiçi olduğunuzda otomatik olarak senkronize edilecek.",
 		rate: '{rating} yıldız ver: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Depolama Kullanımı",
@@ -165,6 +167,9 @@ const tr: BaseDict = {
 	settings: {
 		appearance: "Görünüm",
 		artwork_sizes: "Kapak boyutları",
+		auto_sync: "Otomatik Senkronizasyon",
+		auto_sync_all: "Tümü",
+		auto_sync_scrobbles: "Skroplamalar",
 		auto_download: "Otomatik İndirme",
 		auto_download_songs: "Şarkılar",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/uk.ts b/src/lib/languages/locales/uk.ts
index b2d4344..c9d0ad1 100644
--- a/src/lib/languages/locales/uk.ts
+++ b/src/lib/languages/locales/uk.ts
@@ -150,6 +150,8 @@ const uk: BaseDict = {
 		no_changes: "Немає незавершених змін.",
 		offline_notice:
 			"Ви офлайн! Коли знову з’явиться з’єднання, зміни доведеться синхронізувати вручну.",
+		offline_notice_auto_sync:
+			"Ви офлайн! Вибрані зміни автоматично синхронізуються після відновлення з’єднання.",
 		rate: 'Оцінити на {rating} зірок: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Використання сховища",
@@ -165,6 +167,9 @@ const uk: BaseDict = {
 	settings: {
 		appearance: "Зовнішній вигляд",
 		artwork_sizes: "Розміри обкладинок",
+		auto_sync: "Автосинхронізація",
+		auto_sync_all: "Все",
+		auto_sync_scrobbles: "Скробли",
 		auto_download: "Автоматичне завантаження",
 		auto_download_songs: "Пісні",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/vi.ts b/src/lib/languages/locales/vi.ts
index 61b6997..518662c 100644
--- a/src/lib/languages/locales/vi.ts
+++ b/src/lib/languages/locales/vi.ts
@@ -150,6 +150,8 @@ const vi: BaseDict = {
 		no_changes: "Không có thay đổi đang chờ xử lý.",
 		offline_notice:
 			"Bạn đang ngoại tuyến! Bạn sẽ cần đồng bộ thay đổi thủ công khi trực tuyến trở lại.",
+		offline_notice_auto_sync:
+			"Bạn đang ngoại tuyến! Các thay đổi đã chọn sẽ tự động đồng bộ khi bạn trực tuyến trở lại.",
 		rate: 'Đánh giá {rating} sao: "{title}"',
 		scrobble: 'Scrobble: "{title}"',
 		storage_usage: "Sử dụng bộ nhớ",
@@ -165,6 +167,9 @@ const vi: BaseDict = {
 	settings: {
 		appearance: "Diện mạo",
 		artwork_sizes: "Kích thước ảnh bìa",
+		auto_sync: "Tự động đồng bộ",
+		auto_sync_all: "Tất cả",
+		auto_sync_scrobbles: "Lượt scrobble",
 		auto_download: "Tự động tải xuống",
 		auto_download_songs: "Bài hát",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/zhcn.ts b/src/lib/languages/locales/zhcn.ts
index 517f088..9e81f84 100644
--- a/src/lib/languages/locales/zhcn.ts
+++ b/src/lib/languages/locales/zhcn.ts
@@ -146,6 +146,8 @@ const zhcn: BaseDict = {
 		favorite_song: "最喜欢：「{title}」",
 		no_changes: "没有待处理的更改。",
 		offline_notice: "你当前处于离线状态！恢复联网后需要手动同步更改。",
+		offline_notice_auto_sync:
+			"你当前处于离线状态！所选更改将在恢复联网后自动同步。",
 		rate: "评分 {rating} 星：「{title}」",
 		scrobble: "Scrobble：「{title}」",
 		storage_usage: "存储使用情况",
@@ -160,6 +162,9 @@ const zhcn: BaseDict = {
 	settings: {
 		appearance: "外观",
 		artwork_sizes: "封面尺寸",
+		auto_sync: "自动同步",
+		auto_sync_all: "全部",
+		auto_sync_scrobbles: "听歌记录",
 		auto_download: "自动下载",
 		auto_download_songs: "歌曲",
 		auto_download_high_warning:
diff --git a/src/lib/languages/locales/zhtw.ts b/src/lib/languages/locales/zhtw.ts
index e95c343..0e440e1 100644
--- a/src/lib/languages/locales/zhtw.ts
+++ b/src/lib/languages/locales/zhtw.ts
@@ -146,6 +146,8 @@ const zhtw: BaseDict = {
 		favorite_song: "最喜歡：「{title}」",
 		no_changes: "沒有待處理的變更。",
 		offline_notice: "你目前處於離線狀態！恢復連線後需要手動同步變更。",
+		offline_notice_auto_sync:
+			"你目前處於離線狀態！所選變更會在恢復連線後自動同步。",
 		rate: "評分 {rating} 星：「{title}」",
 		scrobble: "Scrobble：「{title}」",
 		storage_usage: "儲存使用情況",
@@ -160,6 +162,9 @@ const zhtw: BaseDict = {
 	settings: {
 		appearance: "外觀",
 		artwork_sizes: "封面尺寸",
+		auto_sync: "自動同步",
+		auto_sync_all: "全部",
+		auto_sync_scrobbles: "聆聽記錄",
 		auto_download: "自動下載",
 		auto_download_songs: "歌曲",
 		auto_download_high_warning:
diff --git a/src/lib/languages/translate.svelte.ts b/src/lib/languages/translate.svelte.ts
index 71c172f..a4a1722 100644
--- a/src/lib/languages/translate.svelte.ts
+++ b/src/lib/languages/translate.svelte.ts
@@ -9,7 +9,9 @@ export const t = (
 	const get = (d: unknown) =>
 		keys.reduce((o: unknown, k) => (o as Record<string, unknown>)?.[k], d);
 
-	const raw = get(loadedLocales[settings.lang] ?? loadedLocales.en);
+	const raw =
+		get(loadedLocales[settings.lang] ?? loadedLocales.en) ??
+		get(loadedLocales.en);
 	let translation = typeof raw === "string" ? raw : translationKey;
 
 	if (settings.fontLowercase) {
diff --git a/src/lib/offline/offlineManager.svelte.ts b/src/lib/offline/offlineManager.svelte.ts
index da073f6..8592225 100644
--- a/src/lib/offline/offlineManager.svelte.ts
+++ b/src/lib/offline/offlineManager.svelte.ts
@@ -101,6 +101,7 @@ class OfflineManager {
 	queuedDownloadIds = new SvelteSet<string>();
 	private downloadBatchQueue: DownloadBatch[] = [];
 	private reconnectTimer: ReturnType<typeof setInterval> | null = null;
+	private activeQueueSync: Promise<void> | null = null;
 
 	downloadProgress = $state({
 		downloading: false,
@@ -676,7 +677,35 @@ class OfflineManager {
 		await this.loadSyncQueue();
 	}
 
+	async autoSyncQueuedRequests() {
+		if (this.isOfflineMode || settings.downloadsAutoSyncMode === "none") return;
+
+		await this.loadSyncQueue();
+		const idsToSync = this.queuedRequests
+			.filter(
+				(req) =>
+					settings.downloadsAutoSyncMode === "all" || req.method === "scrobble",
+			)
+			.map((req) => req.id)
+			.filter((id): id is number => id !== undefined);
+		if (!idsToSync.length) return;
+
+		await this.executeQueueSync(idsToSync);
+	}
+
 	async executeQueueSync(idsToSync: number[]) {
+		while (this.activeQueueSync) await this.activeQueueSync;
+
+		const task = this.performQueueSync(idsToSync);
+		this.activeQueueSync = task;
+		try {
+			await task;
+		} finally {
+			if (this.activeQueueSync === task) this.activeQueueSync = null;
+		}
+	}
+
+	private async performQueueSync(idsToSync: number[]) {
 		if (!this.queuedRequests.length) return;
 
 		const syncSet = new Set(idsToSync);
@@ -758,6 +787,7 @@ class OfflineManager {
 				await store.deleteUnsyncedChange(req.id);
 			} catch (err) {
 				console.error("failed to sync offline request:", req, err);
+				if (this.isOfflineMode) break;
 			}
 		}
 
diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts
index 5949d6b..b5ddb19 100644
--- a/src/lib/settings.svelte.ts
+++ b/src/lib/settings.svelte.ts
@@ -3,6 +3,7 @@ import { type LangCode, langCodes } from "./languages/index.js";
 import { ui } from "./ui.svelte.js";
 
 type ReplayGainMode = "off" | "track" | "album";
+type DownloadsAutoSyncMode = "none" | "scrobbles" | "all";
 
 type SettingDef<T> = {
 	default: T;
@@ -28,6 +29,10 @@ const settingDefs = {
 	dynamicColors: { default: false },
 	downloads: { default: false },
 	downloadsAuto: { default: false },
+	downloadsAutoSyncMode: {
+		default: "scrobbles" as DownloadsAutoSyncMode,
+		validate: oneOf("none", "scrobbles", "all"),
+	},
 	downloadsAutoDelete: { default: false },
 	downloadsAutoDeleteDays: { default: 30 },
 	downloadsAutoSongs: { default: 3 },