1 files changed, 2 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/Devices/SqliteDeviceRepository.cs b/Emby.Server.Implementations/Devices/SqliteDeviceRepository.cs
index e8b7466a5..ca0552d98 100644
--- a/Emby.Server.Implementations/Devices/SqliteDeviceRepository.cs
+++ b/Emby.Server.Implementations/Devices/SqliteDeviceRepository.cs
@@ -83,6 +83,8 @@ namespace Emby.Server.Implementations.Devices
                 {
                     var device = _json.DeserializeFromFile<DeviceInfo>(file);
 
+                    device.Name = string.IsNullOrWhiteSpace(device.CustomName) ? device.ReportedName : device.CustomName;
+
                     SaveDevice(device);
                 }
                 catch (Exception ex)