2 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
index 3211f88d5..84dd8a97c 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
@@ -109,7 +109,7 @@ namespace MediaBrowser.Server.Implementations.Devices
                 devices = devices.Where(i =>
                 {
                     var caps = GetCapabilities(i.Id);
-                    var deviceVal = caps.SupportsUniqueIdentifier ?? caps.SupportsPersistentIdentifier;
+                    var deviceVal = caps.SupportsPersistentIdentifier;
                     return deviceVal == val;
                 });
             }
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index a9488190c..d02ef9d27 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1327,8 +1327,7 @@ namespace MediaBrowser.Server.Implementations.Session
             ClientCapabilities capabilities,
             bool saveCapabilities)
         {
-            session.PlayableMediaTypes = capabilities.PlayableMediaTypes;
-            session.SupportedCommands = capabilities.SupportedCommands;
+            session.Capabilities = capabilities;
 
             if (!string.IsNullOrWhiteSpace(capabilities.MessageCallbackUrl))
             {