diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs
index c1f0ccc0f3..35aae68a07 100644
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@@ -836,7 +836,7 @@ namespace MediaBrowser.Controller.Library
 
             BaseItem item = null;
 
-            if (!isIndexFolder)
+            if (userId.HasValue || !isIndexFolder)
             {
                 item = libraryManager.GetItemById(new Guid(id));
             }