diff --git a/src/pages/AlbumPage.tsx b/src/pages/AlbumPage.tsx
index cb8d3033f642942ed17f59f8e8107fb947345c03..5f50e798e60c19676b2cfd94d12605a02fa21acc 100644
--- a/src/pages/AlbumPage.tsx
+++ b/src/pages/AlbumPage.tsx
@@ -15,6 +15,7 @@ interface PremiumAlbum {
 
 const AlbumPage: React.FC = () => {
   const [dataAlbums, setDataAlbums] = useState<PremiumAlbum[]>([]);
+  const [loading, setLoading] = useState(true);
   const navigate = useNavigate();
 
   useEffect(() => {
@@ -24,8 +25,10 @@ const AlbumPage: React.FC = () => {
         console.log(response);
 
         setDataAlbums(response.data);
+        setLoading(false);
       } catch (error) {
         console.error('Error fetching data:', error);
+        setLoading(true)
       }
     };
 
@@ -41,9 +44,12 @@ const AlbumPage: React.FC = () => {
         <button className="bg-white hover:bg-gray-300 px-4 py-2 rounded absolute top-10 right-10" onClick={toAddAlbum}>
         Add Album
         </button>
-        {dataAlbums.map((album) => (
+        {
+          loading ? <div className="text-white">Loading . . .</div> :
+          dataAlbums.map((album) => (
           <AlbumCard key={album.albumId} {...album} />
-        ))}
+          ))
+        }
       </div>
     );
   };
diff --git a/src/pages/SongsPage.tsx b/src/pages/SongsPage.tsx
index 962273e9ca64aa9a6801a67cd81eb829915fd04f..2c5706ea95fa2c9a68d397dc8eb7927ce464923a 100644
--- a/src/pages/SongsPage.tsx
+++ b/src/pages/SongsPage.tsx
@@ -8,17 +8,18 @@ import axios from 'axios';
 interface PremiumSong {
   songId: number;
   albumId: number;
-  title: String;
-  artist: String;
+  title: string;
+  artist: string;
   songNumber: number;
   discNumber:number;
   duration:number;
-  audioFilename: String;
+  audioFilename: string;
 }
 
 const SongsPage: React.FC = () => {
   const { albumId } = useParams<{ albumId: string }>();
   const [songsData, setSongsData] = useState<PremiumSong[]>([]);
+  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
     const fetchData = async () => {
@@ -27,8 +28,10 @@ const SongsPage: React.FC = () => {
         console.log(response);
 
         setSongsData(response.data);
+        setLoading(false);
       } catch (error) {
         console.error('Error fetching data:', error);
+        setLoading(true)
       }
     };
 
@@ -80,7 +83,9 @@ const SongsPage: React.FC = () => {
             </button>
         </div>
         <div>
-            <TableSongs {...songsData} />
+          {
+            loading ? <div className="text-white">Loading . . .</div> : <TableSongs {...songsData} />
+          }
         </div>
     </div>
   );