diff --git a/packages/frontend/src/components/PaginatedSongList.tsx b/packages/frontend/src/components/PaginatedSongList.tsx
index 1430296..8b9b143 100644
--- a/packages/frontend/src/components/PaginatedSongList.tsx
+++ b/packages/frontend/src/components/PaginatedSongList.tsx
@@ -257,7 +257,7 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
             // Reset the flag after a short delay to prevent multiple triggers
             timeoutRef.current = setTimeout(() => {
               isTriggeringRef.current = false;
-            }, 1000);
+            }, 100);
           }
         },
         { 
diff --git a/packages/frontend/src/hooks/usePaginatedSongs.ts b/packages/frontend/src/hooks/usePaginatedSongs.ts
index 93fad38..6fdcee6 100644
--- a/packages/frontend/src/hooks/usePaginatedSongs.ts
+++ b/packages/frontend/src/hooks/usePaginatedSongs.ts
@@ -149,10 +149,8 @@ export const usePaginatedSongs = (options: UsePaginatedSongsOptions = {}) => {
       setCurrentPage(1);
       setSearchQuery(initialSearch);
       setError(null);
-      // Use setTimeout to avoid the dependency issue
-      setTimeout(() => {
-        loadPage(1, initialSearch, playlistName);
-      }, 0);
+      // Load immediately without setTimeout
+      loadPage(1, initialSearch, playlistName);
     }
   }, [playlistName, isInitialLoad, initialSearch, loadPage]);