1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
index 3810fec66..99fa40789 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
@@ -105,7 +105,12 @@ namespace MediaBrowser.Server.Implementations.Devices
                 var val = query.SupportsUniqueIdentifier.Value;
 
                 devices = devices.Where(i => GetCapabilities(i.Id).SupportsUniqueIdentifier == val);
-            } 
+            }
+
+            if (!string.IsNullOrWhiteSpace(query.UserId))
+            {
+                devices = devices.Where(i => CanAccessDevice(query.UserId, i.Id));
+            }
             
             var array = devices.ToArray();
             return new QueryResult<DeviceInfo>