diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 92ef65bf11..b8c778690b 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -532,7 +532,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;
             }