1 files changed, 4 insertions, 9 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 0c1018499..5b926b0f4 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2462,19 +2462,14 @@ namespace Emby.Server.Implementations.Library
 
         public BaseItem GetParentItem(string parentId, Guid? userId)
         {
-            if (!string.IsNullOrEmpty(parentId))
+            if (string.IsNullOrEmpty(parentId))
             {
-                return GetItemById(new Guid(parentId));
+                return GetParentItem((Guid?)null, userId);
             }
 
-            if (userId.HasValue && userId != Guid.Empty)
-            {
-                return GetUserRootFolder();
-            }
-
-            return RootFolder;
+            return GetParentItem(new Guid(parentId), userId);
         }
-        
+
         public BaseItem GetParentItem(Guid? parentId, Guid? userId)
         {
             if (parentId.HasValue)