diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 40a346e95e..ac730fa432 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -535,7 +535,7 @@ namespace Emby.Server.Implementations.Session
             }
 
             var deviceOptions = await _deviceManager.GetDeviceOptions(deviceId).ConfigureAwait(false);
-            if (string.IsNullOrEmpty(deviceOptions?.CustomName))
+            if (string.IsNullOrEmpty(deviceOptions.CustomName))
             {
                 sessionInfo.DeviceName = deviceName;
             }
diff --git a/Jellyfin.Api/Controllers/DevicesController.cs b/Jellyfin.Api/Controllers/DevicesController.cs
index d4c2dbba0f..26b9a854da 100644
--- a/Jellyfin.Api/Controllers/DevicesController.cs
+++ b/Jellyfin.Api/Controllers/DevicesController.cs
@@ -107,12 +107,6 @@ namespace Jellyfin.Api.Controllers
             [FromQuery, Required] string id,
             [FromBody, Required] DeviceOptions deviceOptions)
         {
-            var existingDeviceOptions = await _deviceManager.GetDeviceOptions(id).ConfigureAwait(false);
-            if (existingDeviceOptions == null)
-            {
-                return NotFound();
-            }
-
             await _deviceManager.UpdateDeviceOptions(id, deviceOptions).ConfigureAwait(false);
             return NoContent();
         }
diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index 484a53428c..b02ca4ef0a 100644
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -74,13 +74,15 @@ namespace Jellyfin.Server.Implementations.Devices
         }
 
         /// <inheritdoc />
-        public async Task<DeviceOptions?> GetDeviceOptions(string deviceId)
+        public async Task<DeviceOptions> GetDeviceOptions(string deviceId)
         {
             await using var dbContext = _dbProvider.CreateContext();
-            return await dbContext.DeviceOptions
+            var deviceOptions = await dbContext.DeviceOptions
                 .AsQueryable()
                 .FirstOrDefaultAsync(d => d.DeviceId == deviceId)
                 .ConfigureAwait(false);
+
+            return deviceOptions ?? new DeviceOptions(deviceId);
         }
 
         /// <inheritdoc />