diff --git a/apps/web/src/pages/home-page.tsx b/apps/web/src/pages/home-page.tsx
index bc7730b..bf280b7 100644
--- a/apps/web/src/pages/home-page.tsx
+++ b/apps/web/src/pages/home-page.tsx
@@ -20,7 +20,8 @@ export function HomePage() {
     queryFn: fetchRecentlyPlayed,
   })
 
-  const heroTrack = tracksQuery.data?.items[0]
+  const allTracks = tracksQuery.data?.items ?? []
+  const heroTrack = allTracks[0]
   const recentAlbums = homeQuery.data?.recentAlbums ?? []
   const recentTracks = recentTracksQuery.data?.items ?? homeQuery.data?.recentTracks ?? []
   const popularAlbums = [...recentAlbums].reverse()
@@ -70,8 +71,8 @@ export function HomePage() {
       </section>
 
       <TrackRow title="Недавно прослушанные" tracks={recentTracks} onPlayAll={() => setQueue(recentTracks)} />
-      <AlbumRow title="Недавно добавленные" albums={recentAlbums} onPlayAll={() => setQueue(tracksQuery.data?.items ?? [])} />
-      <AlbumRow title="Наиболее прослушиваемые" albums={popularAlbums} onPlayAll={() => setQueue(tracksQuery.data?.items ?? [])} />
+      <AlbumRow title="Недавно добавленные" albums={recentAlbums} onPlayAll={() => setQueue(allTracks)} />
+      <AlbumRow title="Наиболее прослушиваемые" albums={popularAlbums} onPlayAll={() => setQueue(allTracks)} />
     </div>
   )
 }