GetDeviceOptions always returns an instance of DeviceOptions

1 files changed, 4 insertions, 2 deletions

diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index 484a53428..b02ca4ef0 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 />