diff --git a/lib/pages/lyrics/plain_lyrics.dart b/lib/pages/lyrics/plain_lyrics.dart
index fab9b330..ef83da7d 100644
--- a/lib/pages/lyrics/plain_lyrics.dart
+++ b/lib/pages/lyrics/plain_lyrics.dart
@@ -12,8 +12,8 @@ import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
+import 'package:spotube/provider/spotify/spotify.dart';
 
-import 'package:spotube/services/queries/queries.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 
 class PlainLyrics extends HookConsumerWidget {
@@ -30,8 +30,7 @@ class PlainLyrics extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, ref) {
     final playlist = ref.watch(ProxyPlaylistNotifier.provider);
-    final lyricsQuery =
-        useQueries.lyrics.spotifySynced(ref, playlist.activeTrack);
+    final lyricsQuery = ref.watch(syncedLyricsProvider(playlist.activeTrack));
     final mediaQuery = MediaQuery.of(context);
     final textTheme = Theme.of(context).textTheme;
 
@@ -96,9 +95,9 @@ class PlainLyrics extends HookConsumerWidget {
                         }
 
                         final lyrics =
-                            lyricsQuery.data?.lyrics.mapIndexed((i, e) {
+                            lyricsQuery.value?.lyrics.mapIndexed((i, e) {
                           final next =
-                              lyricsQuery.data?.lyrics.elementAtOrNull(i + 1);
+                              lyricsQuery.value?.lyrics.elementAtOrNull(i + 1);
                           if (next != null &&
                               e.time - next.time >
                                   const Duration(milliseconds: 700)) {
diff --git a/lib/pages/lyrics/synced_lyrics.dart b/lib/pages/lyrics/synced_lyrics.dart
index 5919ea83..872ad514 100644
--- a/lib/pages/lyrics/synced_lyrics.dart
+++ b/lib/pages/lyrics/synced_lyrics.dart
@@ -13,14 +13,12 @@ import 'package:spotube/hooks/controllers/use_auto_scroll_controller.dart';
 import 'package:spotube/components/lyrics/use_synced_lyrics.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
 import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
+import 'package:spotube/provider/spotify/spotify.dart';
 import 'package:spotube/services/audio_player/audio_player.dart';
-import 'package:spotube/services/queries/queries.dart';
 
 import 'package:spotube/utils/type_conversion_utils.dart';
 import 'package:stroke_text/stroke_text.dart';
 
-final _delay = StateProvider<int>((ref) => 0);
-
 class SyncedLyrics extends HookConsumerWidget {
   final PaletteColor palette;
   final bool? isModal;
@@ -40,28 +38,18 @@ class SyncedLyrics extends HookConsumerWidget {
     final mediaQuery = MediaQuery.of(context);
     final controller = useAutoScrollController();
 
-    final delay = ref.watch(_delay);
+    final delay = ref.watch(syncedLyricsDelayProvider);
 
     final timedLyricsQuery =
-        useQueries.lyrics.spotifySynced(ref, playlist.activeTrack);
+        ref.watch(syncedLyricsProvider(playlist.activeTrack));
 
-    final lyricValue = timedLyricsQuery.data;
+    final lyricValue = timedLyricsQuery.asData?.value;
 
-    final isUnSyncLyric = useMemoized(
-      () => lyricValue?.lyrics.every((l) => l.time == Duration.zero),
-      [lyricValue],
+    final lyricsState = ref.watch(
+      syncedLyricsMapProvider(playlist.activeTrack),
     );
-
-    final lyricsMap = useMemoized(
-      () =>
-          lyricValue?.lyrics
-              .map((lyric) => {lyric.time.inSeconds: lyric.text})
-              .reduce((accumulator, lyricSlice) =>
-                  {...accumulator, ...lyricSlice}) ??
-          {},
-      [lyricValue],
-    );
-    final currentTime = useSyncedLyrics(ref, lyricsMap, delay);
+    final currentTime =
+        useSyncedLyrics(ref, lyricsState.asData?.value.lyricsMap ?? {}, delay);
     final textZoomLevel = useState<int>(defaultTextZoom);
 
     final textTheme = Theme.of(context).textTheme;
@@ -70,7 +58,7 @@ class SyncedLyrics extends HookConsumerWidget {
       ProxyPlaylistNotifier.provider.select((s) => s.activeTrack),
       (previous, next) {
         controller.scrollToIndex(0);
-        ref.read(_delay.notifier).state = 0;
+        ref.read(syncedLyricsDelayProvider.notifier).state = 0;
       },
     );
 
@@ -105,7 +93,7 @@ class SyncedLyrics extends HookConsumerWidget {
               ),
             if (lyricValue != null &&
                 lyricValue.lyrics.isNotEmpty &&
-                isUnSyncLyric == false)
+                lyricsState.asData?.value.static != true)
               Expanded(
                 child: ListView.builder(
                   controller: controller,
@@ -202,7 +190,7 @@ class SyncedLyrics extends HookConsumerWidget {
               ),
               const Gap(26),
               const Icon(SpotubeIcons.noLyrics, size: 60),
-            ] else if (isUnSyncLyric == true)
+            ] else if (lyricsState.asData?.value.static == true)
               Expanded(
                 child: Center(
                   child: RichText(
@@ -235,7 +223,8 @@ class SyncedLyrics extends HookConsumerWidget {
             final actions = [
               ZoomControls(
                 value: delay,
-                onChanged: (value) => ref.read(_delay.notifier).state = value,
+                onChanged: (value) =>
+                    ref.read(syncedLyricsDelayProvider.notifier).state = value,
                 interval: 1,
                 unit: "s",
                 increaseIcon: const Icon(SpotubeIcons.add),
diff --git a/lib/provider/spotify/lyrics/synced.dart b/lib/provider/spotify/lyrics/synced.dart
index 03773404..d86735db 100644
--- a/lib/provider/spotify/lyrics/synced.dart
+++ b/lib/provider/spotify/lyrics/synced.dart
@@ -54,3 +54,24 @@ class SyncedLyricsNotifier extends FamilyAsyncNotifier<SubtitleSimple, Track?>
   @override
   Map<String, dynamic> toJson(SubtitleSimple data) => data.toJson();
 }
+
+final syncedLyricsDelayProvider = StateProvider<int>((ref) => 0);
+
+final syncedLyricsProvider =
+    AsyncNotifierProviderFamily<SyncedLyricsNotifier, SubtitleSimple, Track?>(
+  () => SyncedLyricsNotifier(),
+);
+
+final syncedLyricsMapProvider =
+    FutureProvider.family((ref, Track? track) async {
+  final syncedLyrics = await ref.watch(syncedLyricsProvider(track).future);
+
+  final isStaticLyrics =
+      syncedLyrics.lyrics.every((l) => l.time == Duration.zero);
+
+  final lyricsMap = syncedLyrics.lyrics
+      .map((lyric) => {lyric.time.inSeconds: lyric.text})
+      .reduce((accumulator, lyricSlice) => {...accumulator, ...lyricSlice});
+
+  return (static: isStaticLyrics, lyricsMap: lyricsMap);
+});