diff --git a/src/features/album-detail/AlbumDetailPage.tsx b/src/features/album-detail/AlbumDetailPage.tsx
index 2044886..bb2390b 100644
--- a/src/features/album-detail/AlbumDetailPage.tsx
+++ b/src/features/album-detail/AlbumDetailPage.tsx
@@ -1,6 +1,6 @@
 import { useParams, useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { ScrollArea, IconButton, Button } from '@olly/modern-sk';
+import { ScrollArea, IconButton, Button, Callout } from '@olly/modern-sk';
 import {
   useGetAlbumQuery,
   useGetAlbumTracksQuery,
@@ -10,6 +10,11 @@ import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
 import { ErrorState } from '../../components/common/ErrorState';
 import { EmptyState } from '../../components/common/EmptyState';
 import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import {
+  selectLocalAlbums,
+  selectLocalTracks,
+} from '../../store/selectors/localLibrary';
 import { setQueue } from '../../store/slices/queue';
 import { formatDuration } from '../../lib/format';
 import { getCoverUrl, getTrackCoverUrl } from '../../api/endpoints/streaming';
@@ -24,15 +29,36 @@ export function AlbumDetailPage() {
   const albumQuery = useGetAlbumQuery(albumId ?? '', { skip: !albumId });
   const tracksQuery = useGetAlbumTracksQuery(albumId ?? '', { skip: !albumId });
 
-  if (albumQuery.isLoading || tracksQuery.isLoading) {
-    return (
-      <div style={{ padding: '1.5rem' }}>
-        <LoadingSkeleton rows={10} />
-      </div>
-    );
-  }
+  // Offline fallback: resolve the album + its tracks from the locally-cached
+  // library when the backend is unreachable (same approach as LibraryPage).
+  const offline = useIsOffline();
+  const localAlbums = useAppSelector(selectLocalAlbums);
+  const localTracks = useAppSelector(selectLocalTracks);
 
-  if (albumQuery.isError) {
+  const album =
+    albumQuery.data ??
+    (offline ? localAlbums.find((a) => a.id === albumId) : undefined);
+  const tracks =
+    tracksQuery.data ??
+    (offline ? localTracks.filter((tr) => tr.albumId === albumId) : []);
+
+  if (!album) {
+    if (albumQuery.isLoading && !offline) {
+      return (
+        <div style={{ padding: '1.5rem' }}>
+          <LoadingSkeleton rows={10} />
+        </div>
+      );
+    }
+    if (offline) {
+      return (
+        <EmptyState
+          icon="💿"
+          title={t('album.offline.title')}
+          description={t('album.offline.description')}
+        />
+      );
+    }
     return (
       <ErrorState
         message={t('album.error')}
@@ -40,9 +66,6 @@ export function AlbumDetailPage() {
       />
     );
   }
-
-  const album = albumQuery.data;
-  const tracks = tracksQuery.data ?? [];
   // The album record itself carries no cover; fall back to a track's cover.
   const coverTrack = tracks.find((t) => t.hasCover);
   const artUrl =
@@ -72,6 +95,11 @@ export function AlbumDetailPage() {
 
   return (
     <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      {offline && (
+        <div style={{ padding: '0.75rem 1.5rem 0', flexShrink: 0 }}>
+          <Callout variant="info">{t('common.offlineBanner')}</Callout>
+        </div>
+      )}
       <div
         style={{
           padding: '1.25rem 1.5rem',
@@ -168,16 +196,17 @@ export function AlbumDetailPage() {
       </div>
 
       <ScrollArea style={{ flex: 1 }}>
-        {tracksQuery.isLoading && <LoadingSkeleton rows={10} />}
-        {tracksQuery.isError && (
+        {tracks.length === 0 && !offline && tracksQuery.isLoading && (
+          <LoadingSkeleton rows={10} />
+        )}
+        {tracks.length === 0 && !offline && tracksQuery.isError && (
           <ErrorState
             message={t('album.tracksError')}
             onRetry={() => tracksQuery.refetch()}
           />
         )}
-        {!tracksQuery.isLoading &&
-          !tracksQuery.isError &&
-          tracks.length === 0 && (
+        {tracks.length === 0 &&
+          (offline || (!tracksQuery.isLoading && !tracksQuery.isError)) && (
             <EmptyState
               icon="♫"
               title={t('album.empty.title')}
diff --git a/src/features/artist-detail/ArtistDetailPage.tsx b/src/features/artist-detail/ArtistDetailPage.tsx
index 3bc9cf0..290b3ec 100644
--- a/src/features/artist-detail/ArtistDetailPage.tsx
+++ b/src/features/artist-detail/ArtistDetailPage.tsx
@@ -1,6 +1,6 @@
 import { useParams, useNavigate } from 'react-router';
 import { useTranslation } from 'react-i18next';
-import { ScrollArea, IconButton, Button, Card } from '@olly/modern-sk';
+import { ScrollArea, IconButton, Button, Card, Callout } from '@olly/modern-sk';
 import {
   useGetArtistQuery,
   useGetArtistAlbumsQuery,
@@ -11,7 +11,13 @@ import { ArtTile } from '../../components/common/ArtTile';
 import { LoadingSkeleton } from '../../components/common/LoadingSkeleton';
 import { ErrorState } from '../../components/common/ErrorState';
 import { EmptyState } from '../../components/common/EmptyState';
-import { useAppDispatch } from '../../hooks/useAppDispatch';
+import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch';
+import { useIsOffline } from '../../hooks/useConnectionStatus';
+import {
+  selectLocalArtists,
+  selectLocalAlbums,
+  selectLocalTracks,
+} from '../../store/selectors/localLibrary';
 import { setQueue } from '../../store/slices/queue';
 import { formatDuration } from '../../lib/format';
 import { getCoverUrl } from '../../api/endpoints/streaming';
@@ -31,15 +37,40 @@ export function ArtistDetailPage() {
     skip: !artistId,
   });
 
-  if (artistQuery.isLoading) {
-    return (
-      <div style={{ padding: '1.5rem' }}>
-        <LoadingSkeleton rows={10} />
-      </div>
-    );
-  }
+  // Offline fallback: resolve the artist + their albums/tracks from the
+  // locally-cached library when the backend is unreachable.
+  const offline = useIsOffline();
+  const localArtists = useAppSelector(selectLocalArtists);
+  const localAlbums = useAppSelector(selectLocalAlbums);
+  const localTracks = useAppSelector(selectLocalTracks);
 
-  if (artistQuery.isError || !artistQuery.data) {
+  const artist =
+    artistQuery.data ??
+    (offline ? localArtists.find((a) => a.id === artistId) : undefined);
+  const albums =
+    albumsQuery.data ??
+    (offline ? localAlbums.filter((a) => a.artistId === artistId) : []);
+  const tracks =
+    tracksQuery.data ??
+    (offline ? localTracks.filter((tr) => tr.artistId === artistId) : []);
+
+  if (!artist) {
+    if (artistQuery.isLoading && !offline) {
+      return (
+        <div style={{ padding: '1.5rem' }}>
+          <LoadingSkeleton rows={10} />
+        </div>
+      );
+    }
+    if (offline) {
+      return (
+        <EmptyState
+          icon="🎤"
+          title={t('artist.offline.title')}
+          description={t('artist.offline.description')}
+        />
+      );
+    }
     return (
       <ErrorState
         message={t('artist.error')}
@@ -48,10 +79,6 @@ export function ArtistDetailPage() {
     );
   }
 
-  const artist = artistQuery.data;
-  const albums = albumsQuery.data ?? [];
-  const tracks = tracksQuery.data ?? [];
-
   const handlePlayAll = () => {
     if (!tracks.length) return;
     dispatch(
@@ -73,6 +100,11 @@ export function ArtistDetailPage() {
 
   return (
     <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+      {offline && (
+        <div style={{ padding: '0.75rem 1.5rem 0', flexShrink: 0 }}>
+          <Callout variant="info">{t('common.offlineBanner')}</Callout>
+        </div>
+      )}
       <div
         style={{
           padding: '1.25rem 1.5rem',
@@ -152,13 +184,14 @@ export function ArtistDetailPage() {
           >
             {t('artist.albums')}
           </h2>
-          {albumsQuery.isLoading && <LoadingSkeleton rows={3} height={72} />}
-          {albumsQuery.isError && (
+          {albums.length === 0 && !offline && albumsQuery.isLoading && (
+            <LoadingSkeleton rows={3} height={72} />
+          )}
+          {albums.length === 0 && !offline && albumsQuery.isError && (
             <ErrorState onRetry={() => albumsQuery.refetch()} />
           )}
-          {!albumsQuery.isLoading &&
-            !albumsQuery.isError &&
-            albums.length === 0 && (
+          {albums.length === 0 &&
+            (offline || (!albumsQuery.isLoading && !albumsQuery.isError)) && (
               <p style={{ color: 'var(--color-text-3)', fontSize: '0.875rem' }}>
                 {t('artist.noAlbums')}
               </p>
@@ -193,13 +226,14 @@ export function ArtistDetailPage() {
           >
             {t('artist.tracks')}
           </h2>
-          {tracksQuery.isLoading && <LoadingSkeleton rows={6} />}
-          {tracksQuery.isError && (
+          {tracks.length === 0 && !offline && tracksQuery.isLoading && (
+            <LoadingSkeleton rows={6} />
+          )}
+          {tracks.length === 0 && !offline && tracksQuery.isError && (
             <ErrorState onRetry={() => tracksQuery.refetch()} />
           )}
-          {!tracksQuery.isLoading &&
-            !tracksQuery.isError &&
-            tracks.length === 0 && (
+          {tracks.length === 0 &&
+            (offline || (!tracksQuery.isLoading && !tracksQuery.isError)) && (
               <EmptyState
                 icon="♫"
                 title={t('artist.empty.title')}
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 42b27d9..e4e7648 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -114,6 +114,10 @@ const en = {
       title: 'No tracks',
       description: 'This album has no tracks.',
     },
+    offline: {
+      title: 'Album not available offline',
+      description: "You're offline and this album isn't cached on this device.",
+    },
   },
   artist: {
     type: 'Artist',
@@ -127,6 +131,10 @@ const en = {
       title: 'No tracks',
       description: 'This artist has no tracks.',
     },
+    offline: {
+      title: 'Artist not available offline',
+      description: "You're offline and this artist isn't cached on this device.",
+    },
   },
   playlist: {
     type: 'Playlist',
@@ -229,6 +237,7 @@ const en = {
     retry: 'Retry',
     comingSoon: 'Coming soon',
     back: 'Back',
+    offlineBanner: "You're offline — showing locally available data, read-only.",
   },
   storage: {
     subtitle: 'Everything this instance has tucked away',
diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts
index 94124db..92dbe35 100644
--- a/src/i18n/locales/ru.ts
+++ b/src/i18n/locales/ru.ts
@@ -116,6 +116,10 @@ const ru: Translations = {
       title: 'Нет треков',
       description: 'В этом альбоме нет треков.',
     },
+    offline: {
+      title: 'Альбом недоступен офлайн',
+      description: 'Нет связи, а этот альбом не сохранён на устройстве.',
+    },
   },
   artist: {
     type: 'Исполнитель',
@@ -129,6 +133,10 @@ const ru: Translations = {
       title: 'Нет треков',
       description: 'У этого исполнителя нет треков.',
     },
+    offline: {
+      title: 'Исполнитель недоступен офлайн',
+      description: 'Нет связи, а этот исполнитель не сохранён на устройстве.',
+    },
   },
   playlist: {
     type: 'Плейлист',
@@ -231,6 +239,8 @@ const ru: Translations = {
     retry: 'Повторить',
     comingSoon: 'Скоро',
     back: 'Назад',
+    offlineBanner:
+      'Нет связи с сервером — показаны локально доступные данные, только для чтения.',
   },
   storage: {
     subtitle: 'Всё, что хранит этот инстанс',