1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index ee90d2134..23d9b0126 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -128,7 +128,12 @@ namespace MediaBrowser.Api
 
                 if (auth.ContainsKey("UserId"))
                 {
-                    user = UserManager.GetUserById(new Guid(auth["UserId"]));
+                    var userId = auth["UserId"];
+
+                    if (!string.IsNullOrEmpty(userId))
+                    {
+                        user = UserManager.GetUserById(new Guid(userId));
+                    }
                 }
 
                 var deviceId = auth["DeviceId"];