diff --git a/lib/components/genre/category_card.dart b/lib/components/genre/category_card.dart
index 42654ed9c..1aa33cd65 100644
--- a/lib/components/genre/category_card.dart
+++ b/lib/components/genre/category_card.dart
@@ -28,7 +28,9 @@ class CategoryCard extends HookConsumerWidget {
       category.id!,
     );
 
-    if (playlistQuery.hasErrors && !playlistQuery.hasPageData) {
+    if (playlistQuery.hasErrors &&
+        !playlistQuery.hasPageData &&
+        !playlistQuery.isLoadingNextPage) {
       return const SizedBox.shrink();
     }
     final playlists = playlistQuery.pages.expand(
diff --git a/lib/pages/home/personalized.dart b/lib/pages/home/personalized.dart
index d61925927..f7e942bec 100644
--- a/lib/pages/home/personalized.dart
+++ b/lib/pages/home/personalized.dart
@@ -131,7 +131,8 @@ class PersonalizedPage extends HookConsumerWidget {
       child: ListView(
         controller: controller,
         children: [
-          if (!featuredPlaylistsQuery.hasPageData)
+          if (!featuredPlaylistsQuery.hasPageData &&
+              !featuredPlaylistsQuery.isLoadingNextPage)
             const ShimmerCategories()
           else
             PersonalizedItemCard(
diff --git a/lib/pages/search/search.dart b/lib/pages/search/search.dart
index 19a9aafac..c192eb7b5 100644
--- a/lib/pages/search/search.dart
+++ b/lib/pages/search/search.dart
@@ -222,7 +222,8 @@ class SearchPage extends HookConsumerWidget {
                       ),
                     ),
                     if (!searchPlaylist.hasPageData &&
-                        !searchPlaylist.hasPageError)
+                        !searchPlaylist.hasPageError &&
+                        !searchPlaylist.isLoadingNextPage)
                       const CircularProgressIndicator(),
                     if (searchPlaylist.hasPageError)
                       Padding(
@@ -280,7 +281,9 @@ class SearchPage extends HookConsumerWidget {
                         ),
                       ),
                     ),
-                    if (!searchArtist.hasPageData && !searchArtist.hasPageError)
+                    if (!searchArtist.hasPageData &&
+                        !searchArtist.hasPageError &&
+                        !searchArtist.isLoadingNextPage)
                       const CircularProgressIndicator(),
                     if (searchArtist.hasPageError)
                       Padding(
@@ -336,7 +339,9 @@ class SearchPage extends HookConsumerWidget {
                         ),
                       ),
                     ),
-                    if (!searchAlbum.hasPageData && !searchAlbum.hasPageError)
+                    if (!searchAlbum.hasPageData &&
+                        !searchAlbum.hasPageError &&
+                        !searchAlbum.isLoadingNextPage)
                       const CircularProgressIndicator(),
                     if (searchAlbum.hasPageError)
                       Padding(
diff --git a/pubspec.lock b/pubspec.lock
index bd50225ad..15a50f418 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -596,30 +596,27 @@ packages:
   fl_query:
     dependency: "direct main"
     description:
-      path: "packages/fl_query"
-      ref: HEAD
-      resolved-ref: a817713a0bb0c486e908e9ed74467c4f7f58bea7
-      url: "https://github.com/KRTirtho/fl-query.git"
-    source: git
-    version: "1.0.0-alpha.5"
+      name: fl_query
+      sha256: daee5ab0ed8899baa201b89b5813107df5258144a9e2bcf192dbcf922c57d985
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   fl_query_devtools:
     dependency: "direct main"
     description:
-      path: "packages/fl_query_devtools"
-      ref: HEAD
-      resolved-ref: a817713a0bb0c486e908e9ed74467c4f7f58bea7
-      url: "https://github.com/KRTirtho/fl-query.git"
-    source: git
-    version: "0.1.0-alpha.3"
+      name: fl_query_devtools
+      sha256: "2ae8905fd4a95f1d245a1b54057c31c8d27fc961223bcb7ce13088bcf6595059"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   fl_query_hooks:
     dependency: "direct main"
     description:
-      path: "packages/fl_query_hooks"
-      ref: HEAD
-      resolved-ref: a817713a0bb0c486e908e9ed74467c4f7f58bea7
-      url: "https://github.com/KRTirtho/fl-query.git"
-    source: git
-    version: "1.0.0-alpha.5"
+      name: fl_query_hooks
+      sha256: "6c88b3bfbdc3e1330931b927903929d7351f86fc63266ac93b3acb9f133a09a9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   fluentui_system_icons:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 75b14bc17..64b2b6a36 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,18 +32,9 @@ dependencies:
   duration: ^3.0.12
   envied: ^0.3.0
   file_selector: ^1.0.1
-  fl_query:
-    git:
-      url: https://github.com/KRTirtho/fl-query.git
-      path: packages/fl_query
-  fl_query_hooks:
-    git:
-      url: https://github.com/KRTirtho/fl-query.git
-      path: packages/fl_query_hooks
-  fl_query_devtools:
-    git:
-      url: https://github.com/KRTirtho/fl-query.git
-      path: packages/fl_query_devtools
+  fl_query: ^1.0.0
+  fl_query_hooks: ^1.0.0
+  fl_query_devtools: ^0.1.0
   fluentui_system_icons: ^1.1.189
   flutter:
     sdk: flutter
@@ -135,14 +126,6 @@ dev_dependencies:
 dependency_overrides:
   http: ^1.1.0
   system_tray: 2.0.2
-  fl_query:
-    git:
-      url: https://github.com/KRTirtho/fl-query.git
-      path: packages/fl_query
-  fl_query_hooks:
-    git:
-      url: https://github.com/KRTirtho/fl-query.git
-      path: packages/fl_query_hooks
 
 flutter:
   generate: true