diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryRealAppletSelfAccessor.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryRealAppletSelfAccessor.cs
index 13243bdc7..fd33464d6 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryRealAppletSelfAccessor.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryRealAppletSelfAccessor.cs
@@ -231,21 +231,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         public ResultCode GetMainAppletApplicationDesiredLanguage(ServiceCtx context)
         {
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
-            // TODO: Find a better method to get the desired language.
-            string language = "en-US";
-            switch (context.Device.Configuration.Region)
-            {
-                case RegionCode.Japan:
-                    language = "ja";
-                    break;
-                case RegionCode.Europe:
-                    language = "fr";
-                    break;
-                case RegionCode.Korea:
-                    language = "ko";
-                    break;
-            }
-            context.ResponseData.Write(language);
+            context.ResponseData.Write(context.Device.System.State.DesiredLanguageCode);
             return ResultCode.Success;
         }
         
diff --git a/src/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs b/src/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs
index 17bf2cc15..b773849ab 100644
--- a/src/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs
@@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns
         // GetApplicationDesiredLanguage() -> u32
         public ResultCode GetApplicationDesiredLanguage(ServiceCtx context)
         {
-            context.ResponseData.Write((uint)context.Device.Configuration.Region);
+            context.ResponseData.Write((uint)context.Device.System.State.DesiredLanguageCode);
             return ResultCode.Success;
         }
     }
diff --git a/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
index 824b318ef..12fbc6fb3 100644
--- a/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
@@ -128,11 +128,11 @@ namespace Ryujinx.HLE.HOS.Services.Settings
             {
                 return ResultCode.NullEULAVersionBuffer;
             }
-
+            
             var eulaVersion = new EulaVersion
             {
                 Version = 0x10000,
-                RegionCode = 1,
+                RegionCode = context.Device.System.State.DesiredRegionCode,
                 ClockType = 1,
                 NetworkSystemClock = 0,
                 SteadyClock = new Time.Clock.SteadyClockTimePoint {
diff --git a/src/Ryujinx.HLE/HOS/SystemState/RegionCode.cs b/src/Ryujinx.HLE/HOS/SystemState/RegionCode.cs
index 111227237..0a68a7129 100644
--- a/src/Ryujinx.HLE/HOS/SystemState/RegionCode.cs
+++ b/src/Ryujinx.HLE/HOS/SystemState/RegionCode.cs
@@ -7,11 +7,10 @@ namespace Ryujinx.HLE.HOS.SystemState
         USA,
         Europe,
         Australia,
+        HongKongTaiwanKorea,
         China,
-        Korea,
-        Taiwan,
 
         Min = Japan,
-        Max = Taiwan,
+        Max = China,
     }
 }