diff --git a/core/metadata_service.py b/core/metadata_service.py
index b2ec0db4..9173f809 100644
--- a/core/metadata_service.py
+++ b/core/metadata_service.py
@@ -140,8 +140,8 @@ class MetadataService:
         """
         self.preferred_provider = preferred_provider
         self.spotify = SpotifyClient()
-        self._fallback_source = _get_configured_fallback_source()
-        self.itunes = _create_fallback_client()  # May be iTunesClient or DeezerClient
+        self._fallback_source = get_primary_source()
+        self.itunes = get_primary_client()  # May be iTunesClient or DeezerClient
 
         self._log_initialization()
 
@@ -312,10 +312,10 @@ class MetadataService:
         logger.info("Reloading metadata service configuration")
         self.spotify.reload_config()
         # Re-create fallback client in case the setting changed
-        new_source = _get_configured_fallback_source()
+        new_source = get_primary_source()
         if new_source != self._fallback_source:
             self._fallback_source = new_source
-            self.itunes = _create_fallback_client()
+            self.itunes = get_primary_client()
         elif hasattr(self.itunes, 'reload_config'):
             self.itunes.reload_config()
         self._log_initialization()
diff --git a/core/personalized_playlists.py b/core/personalized_playlists.py
index a00c72d7..b4c5aed7 100644
--- a/core/personalized_playlists.py
+++ b/core/personalized_playlists.py
@@ -954,8 +954,8 @@ class PersonalizedPlaylistsService:
                         logger.warning(f"Error getting albums for {artist.get('name', artist['id'])}: {e}")
                         continue
             else:
-                from core.metadata_service import _create_fallback_client
-                itunes = _create_fallback_client()
+                from core.metadata_service import get_primary_client
+                itunes = get_primary_client()
                 for artist in artists_for_albums:
                     try:
                         albums = itunes.get_artist_albums(artist['id'], limit=10)
@@ -1010,8 +1010,8 @@ class PersonalizedPlaylistsService:
                         logger.warning(f"Error getting tracks from album: {e}")
                         continue
             else:
-                from core.metadata_service import _create_fallback_client
-                itunes = _create_fallback_client()
+                from core.metadata_service import get_primary_client
+                itunes = get_primary_client()
                 for album in selected_albums:
                     try:
                         album_data = itunes.get_album(album.id, include_tracks=True)
diff --git a/core/repair_jobs/library_reorganize.py b/core/repair_jobs/library_reorganize.py
index e64465d5..8c6debe0 100644
--- a/core/repair_jobs/library_reorganize.py
+++ b/core/repair_jobs/library_reorganize.py
@@ -785,8 +785,8 @@ class LibraryReorganizeJob(RepairJob):
         if not search_client:
             # Try fallback (iTunes/Deezer)
             try:
-                from core.metadata_service import _create_fallback_client
-                search_client = _create_fallback_client()
+                from core.metadata_service import get_primary_client
+                search_client = get_primary_client()
                 source_name = 'fallback'
             except Exception:
                 pass
diff --git a/core/repair_worker.py b/core/repair_worker.py
index eb3e3c53..163fe461 100644
--- a/core/repair_worker.py
+++ b/core/repair_worker.py
@@ -161,8 +161,8 @@ class RepairWorker:
     def itunes_client(self):
         if self._itunes_client is None:
             try:
-                from core.metadata_service import _create_fallback_client
-                self._itunes_client = _create_fallback_client()
+                from core.metadata_service import get_primary_client
+                self._itunes_client = get_primary_client()
             except Exception as e:
                 logger.error("Failed to initialize fallback metadata client: %s", e)
         return self._itunes_client
diff --git a/core/seasonal_discovery.py b/core/seasonal_discovery.py
index e7f5d4ac..67859607 100644
--- a/core/seasonal_discovery.py
+++ b/core/seasonal_discovery.py
@@ -551,8 +551,8 @@ class SeasonalDiscoveryService:
                         continue
             else:
                 # Fallback metadata source (iTunes or Deezer)
-                from core.metadata_service import _create_fallback_client
-                fallback_client = _create_fallback_client()
+                from core.metadata_service import get_primary_client
+                fallback_client = get_primary_client()
 
                 for keyword in search_keywords:
                     try: