diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
index 6124fed6..78a6a99c 100644
--- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
@@ -45,8 +45,7 @@
     {
         MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
 
-        var languages = PageState.Languages;
-        _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
+        _supportedCultures = PageState.Languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
 
         if (PageState.QueryString.ContainsKey("culture"))
         {
diff --git a/Oqtane.Server/Services/SiteService.cs b/Oqtane.Server/Services/SiteService.cs
index 13007742..84d752c2 100644
--- a/Oqtane.Server/Services/SiteService.cs
+++ b/Oqtane.Server/Services/SiteService.cs
@@ -97,6 +97,7 @@ namespace Oqtane.Services
             {
                 language.Name = CultureInfo.GetCultureInfo(language.Code).DisplayName;
             }
+            site.Languages = site.Languages.OrderBy(item => item.Name).ToList();
 
             return Task.FromResult(site);
         }