diff --git a/watchOS/App/WatchOfflineStore.swift b/watchOS/App/WatchOfflineStore.swift
index 8ea436d..81de8f9 100644
--- a/watchOS/App/WatchOfflineStore.swift
+++ b/watchOS/App/WatchOfflineStore.swift
@@ -26,7 +26,7 @@ class WatchOfflineStore: NSObject, ObservableObject, URLSessionDownloadDelegate
     private let catalogKey = "watch_offline_songs"
     private let fileManager = FileManager.default
     private var pendingSongs: [String: Song] = [:] // taskId → Song
-    private var taskToSongId: [Int: String] = []   // URLSession task ID → songId
+    private var taskToSongId: [Int: String] = [:]   // URLSession task ID → songId
     
     private lazy var backgroundSession: URLSession = {
         let config = URLSessionConfiguration.background(withIdentifier: "com.navidromeplayer.watch.download")
diff --git a/watchOS/App/WatchSessionManager.swift b/watchOS/App/WatchSessionManager.swift
index 7962459..68cea34 100644
--- a/watchOS/App/WatchSessionManager.swift
+++ b/watchOS/App/WatchSessionManager.swift
@@ -358,14 +358,6 @@ extension WatchSessionManager: WCSessionDelegate {
                 self.saveLocalServers()
             }
         }
-        
-        if let catalogData = applicationContext["offlineCatalog"] as? Data,
-           let songs = try? JSONDecoder().decode([Song].self, from: catalogData) {
-            DispatchQueue.main.async {
-                // Update offline store with catalog
-                WatchOfflineStore.shared.updateCatalog(songs)
-            }
-        }
     }
     
     // Receive messages (now playing info + download commands from iPhone)