diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index a4b4c1959..80abe01ab 100644
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -177,7 +177,7 @@ namespace Jellyfin.Server.Implementations.Devices
                     .OrderByDescending(d => d.DateLastActivity)
                     .ThenBy(d => d.DeviceId)
                     .AsAsyncEnumerable();
-
+                IAsyncEnumerable<DeviceOptions> deviceOptions = dbContext.DeviceOptions.AsAsyncEnumerable();
                 if (supportsSync.HasValue)
                 {
                     sessions = sessions.Where(i => GetCapabilities(i.DeviceId).SupportsSync == supportsSync.Value);
@@ -195,6 +195,14 @@ namespace Jellyfin.Server.Implementations.Devices
                 }
 
                 var array = await sessions.Select(device => ToDeviceInfo(device)).ToArrayAsync().ConfigureAwait(false);
+                await foreach (var deviceOption in deviceOptions)
+                {
+                    var deviceInfo = array.FirstOrDefault(d => d.Id.Equals(deviceOption.DeviceId, StringComparison.OrdinalIgnoreCase));
+                    if (deviceInfo != null)
+                    {
+                        deviceInfo.CustomName = deviceOption.CustomName;
+                    }
+                }
 
                 return new QueryResult<DeviceInfo>(array);
             }
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index 7a1c7a738..4962992a0 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -15,6 +15,8 @@ namespace MediaBrowser.Model.Devices
 
         public string Name { get; set; }
 
+        public string CustomName { get; set; }
+
         /// <summary>
         /// Gets or sets the access token.
         /// </summary>