diff --git a/src/renderer/features/albums/routes/album-detail-route.tsx b/src/renderer/features/albums/routes/album-detail-route.tsx
index 4330a65e5..44c2c6628 100644
--- a/src/renderer/features/albums/routes/album-detail-route.tsx
+++ b/src/renderer/features/albums/routes/album-detail-route.tsx
@@ -31,8 +31,7 @@ const AlbumDetailRoute = () => {
 
     const detailQuery = useQuery({
         ...albumQueries.detail({ query: { id: albumId }, serverId: server?.id }),
-        initialData: location.state?.item,
-        staleTime: 0,
+        placeholderData: location.state?.item,
     });
 
     const imageUrl =
diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx
index 320eafa11..43e71adaa 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx
@@ -41,7 +41,7 @@ export const PlaylistDetailSongListHeader = ({
 
     const detailQuery = useQuery({
         ...playlistsQueries.detail({ query: { id: playlistId }, serverId: server?.id }),
-        initialData: location.state?.item,
+        placeholderData: location.state?.item,
     });
 
     const playlistDuration = detailQuery?.data?.duration;
@@ -100,7 +100,7 @@ export const PlaylistDetailSongListHeader = ({
                         route: AppRoute.PLAYLISTS,
                         type: LibraryItem.PLAYLIST,
                     }}
-                    title={detailQuery?.data?.name}
+                    title={detailQuery?.data?.name || ''}
                 >
                     <LibraryHeaderMenu
                         onPlay={(type) => handlePlay(type)}
diff --git a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
index 10b7aaf36..ae29d349c 100644
--- a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
+++ b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
@@ -242,8 +242,7 @@ const PlaylistDetailSongListRoute = () => {
 
     const detailQuery = useQuery({
         ...playlistsQueries.detail({ query: { id: playlistId }, serverId: server?.id }),
-        initialData: location.state?.item,
-        staleTime: 0,
+        placeholderData: location.state?.item,
     });
     const createPlaylistMutation = useCreatePlaylist({});
     const deletePlaylistMutation = useDeletePlaylist({});