diff --git a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
index 2b55a7d..848643f 100644
--- a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
+++ b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
@@ -52,6 +52,7 @@ namespace DualScreenDemo
                     }
                 }
             }
+            private bool _isShowingSinger = true;
             private List<SongData> currentSongList = new List<SongData>();
             public List<SongData> get_currentSongList(){
                 return currentSongList;
@@ -145,7 +146,7 @@ namespace DualScreenDemo
                 {
                     currentPageIndex++;
                     // 如果歌單為0(沒有歌單)，則刷新歌手列表
-                    if(currentSongList.Count == 0)
+                    if(_isShowingSinger)
                     {
                         RefreshDisplayBase_Singer();
                     }
@@ -173,6 +174,7 @@ namespace DualScreenDemo
 
             public void LoadSongs(List<SongData> songs, bool clearHistory = false)
             {
+                _isShowingSinger = false;
                 currentSongList = songs;
                 currentArtistList.Clear();
                 currentPageIndex = 0;
@@ -184,8 +186,9 @@ namespace DualScreenDemo
 
             public void LoadSingers(List<Artist> artists)
             {
+                _isShowingSinger = true;
                 currentArtistList = artists;
-                //currentSongList.Clear();
+                // currentSongList.Clear();
                 currentPageIndex = 0;
                 totalPages = (int)Math.Ceiling(artists.Count / (double)itemsPerPage);
                 RefreshDisplayBase_Singer();
@@ -193,6 +196,7 @@ namespace DualScreenDemo
 
             public void LoadPlayedSongs(List<SongData> songs, List<PlayState> states)
             {
+                _isShowingSinger = false;
                 currentSongList = songs;
                 currentArtistList.Clear();
                 currentPageIndex = 0;
diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs
index de3ee11..4d90c23 100644
--- a/PrimaryFormParts/PrimaryForm.cs
+++ b/PrimaryFormParts/PrimaryForm.cs
@@ -2573,7 +2573,7 @@ namespace DualScreenDemo
                 closeQRCodeButton.Visible = false;
             }
 
-            multiPagePanel.LoadPlayedSongs(currentSongList, playStates);
+            multiPagePanel.LoadPlayedSongs(playedSongsHistory, playStates);
         }
     }
 }
\ No newline at end of file