diff --git a/TaikoLocalServer/Controllers/Game/GetDanOdaiController.cs b/TaikoLocalServer/Controllers/Game/GetDanOdaiController.cs
index a7ec853..3395fab 100644
--- a/TaikoLocalServer/Controllers/Game/GetDanOdaiController.cs
+++ b/TaikoLocalServer/Controllers/Game/GetDanOdaiController.cs
@@ -46,7 +46,6 @@ public class GetDanOdaiController : BaseController<GetDanOdaiController>
                     Logger.LogWarning("Requested dan id {Id} does not exist!", danId);
                     continue;
                 }
-                Logger.LogInformation(odaiData.Stringify());
 
                 response.AryOdaiDatas.Add(odaiData);
             }
diff --git a/TaikoLocalServer/Controllers/Game/GetShopFolderController.cs b/TaikoLocalServer/Controllers/Game/GetShopFolderController.cs
index e11486d..ec7cd53 100644
--- a/TaikoLocalServer/Controllers/Game/GetShopFolderController.cs
+++ b/TaikoLocalServer/Controllers/Game/GetShopFolderController.cs
@@ -19,7 +19,7 @@ public class GetShopFolderController : BaseController<GetShopFolderController>
 
         gameDataService.GetTokenDataDictionary().TryGetValue("shopTokenId", out var shopTokenId);
 
-        var shopFolderDictionary = gameDataService.GetShopFolderDictionary();
+        var shopFolderList = gameDataService.GetShopFolderList();
 
         var response = new GetShopFolderResponse
         {
@@ -28,7 +28,7 @@ public class GetShopFolderController : BaseController<GetShopFolderController>
             VerupNo = 2
         };
 
-        foreach (var shopFolder in shopFolderDictionary) response.AryShopFolderDatas.Add(shopFolder.Value);
+        response.AryShopFolderDatas.AddRange(shopFolderList);
 
         return Ok(response);
     }
diff --git a/TaikoLocalServer/Controllers/Game/PlayResultController.cs b/TaikoLocalServer/Controllers/Game/PlayResultController.cs
index d71f9d0..6068d10 100644
--- a/TaikoLocalServer/Controllers/Game/PlayResultController.cs
+++ b/TaikoLocalServer/Controllers/Game/PlayResultController.cs
@@ -21,15 +21,19 @@ public class PlayResultController : BaseController<PlayResultController>
     private readonly IDanScoreDatumService danScoreDatumService;
 
     private readonly IAiDatumService aiDatumService;
+    
+    private readonly IGameDataService gameDataService;
 
     public PlayResultController(IUserDatumService userDatumService, ISongPlayDatumService songPlayDatumService,
-        ISongBestDatumService songBestDatumService, IDanScoreDatumService danScoreDatumService, IAiDatumService aiDatumService)
+        ISongBestDatumService songBestDatumService, IDanScoreDatumService danScoreDatumService, IAiDatumService aiDatumService,
+        IGameDataService gameDataService)
     {
         this.userDatumService = userDatumService;
         this.songPlayDatumService = songPlayDatumService;
         this.songBestDatumService = songBestDatumService;
         this.danScoreDatumService = danScoreDatumService;
         this.aiDatumService = aiDatumService;
+        this.gameDataService = gameDataService;
     }
 
     [HttpPost]
@@ -74,10 +78,11 @@ public class PlayResultController : BaseController<PlayResultController>
         }
 
         var bestData = await songBestDatumService.GetAllSongBestData(request.BaidConf);
+        
         for (var songNumber = 0; songNumber < playResultData.AryStageInfoes.Count; songNumber++)
         {
             var stageData = playResultData.AryStageInfoes[songNumber];
-
+            
             if (stageData.IsSkipUse)
             {
                 await UpdatePlayData(request, songNumber, stageData, lastPlayDatetime);
diff --git a/TaikoLocalServer/Services/GameDataService.cs b/TaikoLocalServer/Services/GameDataService.cs
index cdf9ca4..a440939 100644
--- a/TaikoLocalServer/Services/GameDataService.cs
+++ b/TaikoLocalServer/Services/GameDataService.cs
@@ -33,10 +33,9 @@ public class GameDataService : IGameDataService
 	private ImmutableDictionary<uint, GetfolderResponse.EventfolderData> folderDictionary =
 		ImmutableDictionary<uint, GetfolderResponse.EventfolderData>.Empty;
 
-	private ImmutableDictionary<uint, GetShopFolderResponse.ShopFolderData> shopFolderDictionary =
-		ImmutableDictionary<uint, GetShopFolderResponse.ShopFolderData>.Empty;
-
 	private ImmutableDictionary<string, uint> qrCodeDataDictionary = ImmutableDictionary<string, uint>.Empty;
+	
+	private List<GetShopFolderResponse.ShopFolderData> shopFolderList = new();
 
 	private List<uint> musics = new();
 
@@ -98,9 +97,9 @@ public class GameDataService : IGameDataService
 		return folderDictionary;
 	}
 
-	public ImmutableDictionary<uint, GetShopFolderResponse.ShopFolderData> GetShopFolderDictionary()
+	public List<GetShopFolderResponse.ShopFolderData> GetShopFolderList()
 	{
-		return shopFolderDictionary;
+		return shopFolderList;
 	}
 
 	public Dictionary<string, int> GetTokenDataDictionary()
@@ -270,7 +269,10 @@ public class GameDataService : IGameDataService
 	private void InitializeShopFolderData(List<ShopFolderData>? shopFolderData)
 	{
 		shopFolderData.ThrowIfNull("Shouldn't happen!");
-		shopFolderDictionary = shopFolderData.ToImmutableDictionary(data => data.SongNo, ToResponseShopFolderData);
+		foreach (var folderData in shopFolderData)
+		{
+			shopFolderList.Add(ToResponseShopFolderData(folderData));
+		}
 	}
 
 	private void InitializeTokenData(Dictionary<string, int>? tokenData)
diff --git a/TaikoLocalServer/Services/Interfaces/IGameDataService.cs b/TaikoLocalServer/Services/Interfaces/IGameDataService.cs
index 40bce35..6bed601 100644
--- a/TaikoLocalServer/Services/Interfaces/IGameDataService.cs
+++ b/TaikoLocalServer/Services/Interfaces/IGameDataService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using SharedProject.Models;
 
 namespace TaikoLocalServer.Services.Interfaces;
 
@@ -24,7 +25,7 @@ public interface IGameDataService
 
 	public ImmutableDictionary<uint, GetfolderResponse.EventfolderData> GetFolderDictionary();
 
-	public ImmutableDictionary<uint, GetShopFolderResponse.ShopFolderData> GetShopFolderDictionary();
+	public List<GetShopFolderResponse.ShopFolderData> GetShopFolderList();
 
 	public Dictionary<string, int> GetTokenDataDictionary();