1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Session/SessionsService.cs
index 4d68cbf39..772110794 100644
--- a/MediaBrowser.Api/Session/SessionsService.cs
+++ b/MediaBrowser.Api/Session/SessionsService.cs
@@ -357,7 +357,12 @@ namespace MediaBrowser.Api.Session
 
                 if (!user.Configuration.EnableRemoteControlOfOtherUsers)
                 {
-                    result = result.Where(i => !i.UserId.HasValue || i.ContainsUser(request.ControllableByUserId.Value));
+                    result = result.Where(i => i.ContainsUser(request.ControllableByUserId.Value));
+                }
+
+                if (!user.Configuration.EnableSharedDeviceControl)
+                {
+                    result = result.Where(i => !i.UserId.HasValue);
                 }
             }