diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index a6bc84311f..2278468d9f 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -58,6 +58,7 @@ public class StartupController : BaseJellyfinApiController
     {
         return new StartupConfigurationDto
         {
+            ServerName = _config.Configuration.ServerName,
             UICulture = _config.Configuration.UICulture,
             MetadataCountryCode = _config.Configuration.MetadataCountryCode,
             PreferredMetadataLanguage = _config.Configuration.PreferredMetadataLanguage
@@ -74,6 +75,7 @@ public class StartupController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status204NoContent)]
     public ActionResult UpdateInitialConfiguration([FromBody, Required] StartupConfigurationDto startupConfiguration)
     {
+        _config.Configuration.ServerName = startupConfiguration.ServerName ?? string.Empty;
         _config.Configuration.UICulture = startupConfiguration.UICulture ?? string.Empty;
         _config.Configuration.MetadataCountryCode = startupConfiguration.MetadataCountryCode ?? string.Empty;
         _config.Configuration.PreferredMetadataLanguage = startupConfiguration.PreferredMetadataLanguage ?? string.Empty;
diff --git a/Jellyfin.Api/Models/StartupDtos/StartupConfigurationDto.cs b/Jellyfin.Api/Models/StartupDtos/StartupConfigurationDto.cs
index 4027078190..1ba23339d0 100644
--- a/Jellyfin.Api/Models/StartupDtos/StartupConfigurationDto.cs
+++ b/Jellyfin.Api/Models/StartupDtos/StartupConfigurationDto.cs
@@ -5,6 +5,11 @@ namespace Jellyfin.Api.Models.StartupDtos;
 /// </summary>
 public class StartupConfigurationDto
 {
+    /// <summary>
+    /// Gets or sets the server name.
+    /// </summary>
+    public string? ServerName { get; set; }
+
     /// <summary>
     /// Gets or sets UI language culture.
     /// </summary>
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/StartupControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/StartupControllerTests.cs
index 36861294b5..36ba6c7e35 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/StartupControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/StartupControllerTests.cs
@@ -31,6 +31,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
 
             var config = new StartupConfigurationDto()
             {
+                ServerName = "NewServer",
                 UICulture = "NewCulture",
                 MetadataCountryCode = "be",
                 PreferredMetadataLanguage = "nl"
@@ -44,7 +45,8 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
             Assert.Equal(MediaTypeNames.Application.Json, getResponse.Content.Headers.ContentType?.MediaType);
 
             var newConfig = await getResponse.Content.ReadFromJsonAsync<StartupConfigurationDto>(_jsonOptions);
-            Assert.Equal(config.UICulture, newConfig!.UICulture);
+            Assert.Equal(config.ServerName, newConfig!.ServerName);
+            Assert.Equal(config.UICulture, newConfig.UICulture);
             Assert.Equal(config.MetadataCountryCode, newConfig.MetadataCountryCode);
             Assert.Equal(config.PreferredMetadataLanguage, newConfig.PreferredMetadataLanguage);
         }