diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
index 7f36ea0..a3104b9 100644
--- a/packages/frontend/src/App.tsx
+++ b/packages/frontend/src/App.tsx
@@ -154,12 +154,12 @@ export default function RekordboxReader() {
     }
   }, [currentPlaylist, playlists, navigate, xmlLoading]);
 
-  // Reset switching state when songs are loaded
+  // Reset switching state when loading starts (immediate transition)
   useEffect(() => {
-    if (songs.length > 0 && isSwitchingPlaylist) {
+    if (songsLoading && isSwitchingPlaylist) {
       setIsSwitchingPlaylist(false);
     }
-  }, [songs.length, isSwitchingPlaylist]);
+  }, [songsLoading, isSwitchingPlaylist]);
 
   const handlePlaylistSelect = (name: string) => {
     // Set switching state immediately for visual feedback
diff --git a/packages/frontend/src/components/PaginatedSongList.tsx b/packages/frontend/src/components/PaginatedSongList.tsx
index 29c610c..70eccd6 100644
--- a/packages/frontend/src/components/PaginatedSongList.tsx
+++ b/packages/frontend/src/components/PaginatedSongList.tsx
@@ -409,12 +409,12 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
         <Flex direction="column" gap={2}>
           {songItems}
           
-          {/* Loading indicator for infinite scroll */}
-          {loading && (
+          {/* Loading indicator for infinite scroll or playlist switching */}
+          {(loading || isSwitchingPlaylist) && (
             <Flex justify="center" align="center" p={6} key="loading-spinner" gap={3}>
               <Spinner size="md" color="blue.400" />
               <Text color="gray.400" fontSize="sm">
-                Loading more songs...
+                {isSwitchingPlaylist ? 'Switching playlist...' : 'Loading more songs...'}
               </Text>
             </Flex>
           )}
@@ -440,21 +440,12 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
             </Flex>
           )}
           
-          {/* No results message or playlist switching indicator */}
-          {!loading && songs.length === 0 && (
+          {/* No results message */}
+          {!loading && !isSwitchingPlaylist && songs.length === 0 && (
             <Flex justify="center" p={8} key="no-results" direction="column" align="center" gap={3}>
-              {isSwitchingPlaylist ? (
-                <>
-                  <Spinner size="md" color="blue.400" />
-                  <Text color="blue.400" fontSize="sm" fontWeight="medium">
-                    Switching playlist...
-                  </Text>
-                </>
-              ) : (
-                <Text color="gray.500">
-                  {searchQuery ? 'No songs found matching your search' : 'No songs available'}
-                </Text>
-              )}
+              <Text color="gray.500">
+                {searchQuery ? 'No songs found matching your search' : 'No songs available'}
+              </Text>
             </Flex>
           )}
         </Flex>
diff --git a/packages/frontend/src/hooks/usePaginatedSongs.ts b/packages/frontend/src/hooks/usePaginatedSongs.ts
index e0bc952..249548a 100644
--- a/packages/frontend/src/hooks/usePaginatedSongs.ts
+++ b/packages/frontend/src/hooks/usePaginatedSongs.ts
@@ -138,7 +138,7 @@ export const usePaginatedSongs = (options: UsePaginatedSongsOptions = {}) => {
     };
   }, []);
 
-  // Handle playlist changes - optimized for immediate response
+  // Handle playlist changes - streamlined for immediate response
   useEffect(() => {
     if (previousPlaylistRef.current !== playlistName) {
       // Update refs immediately
@@ -146,16 +146,14 @@ export const usePaginatedSongs = (options: UsePaginatedSongsOptions = {}) => {
       currentSearchQueryRef.current = searchQuery;
       previousPlaylistRef.current = playlistName;
       
-      // Clear songs IMMEDIATELY for instant visual feedback
+      // Clear all state immediately for instant visual feedback
       setSongs([]);
-      
-      // Batch remaining state updates together to reduce re-renders
-      React.startTransition(() => {
-        setHasMore(true);
-        setCurrentPage(1);
-        setSearchQuery(initialSearch);
-        setError(null);
-      });
+      setTotalSongs(0);
+      setTotalDuration(undefined);
+      setHasMore(true);
+      setCurrentPage(1);
+      setSearchQuery(initialSearch);
+      setError(null);
       
       // Load immediately
       loadPage(1, initialSearch, playlistName);