1 files changed, 8 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index e7c4a293b..4689a4358 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -864,14 +864,7 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>IEnumerable{BaseItem}.</returns>
         protected IEnumerable<BaseItem> GetCachedChildren()
         {
-            var items = ItemRepository.GetChildren(Id).Select(RetrieveChild).Where(i => i != null).ToList();
-
-            foreach (var item in items)
-            {
-                item.Parent = this;
-            }
-
-            return items;
+            return ItemRepository.GetChildren(Id).Select(RetrieveChild).Where(i => i != null);
         }
 
         /// <summary>
@@ -893,7 +886,13 @@ namespace MediaBrowser.Controller.Entities
 
             var item = LibraryManager.RetrieveItem(child.ItemId, itemType);
 
-            return item is IByReferenceItem ? LibraryManager.GetOrAddByReferenceItem(item) : item;
+            if (item is IByReferenceItem)
+            {
+                return LibraryManager.GetOrAddByReferenceItem(item);
+            }
+
+            item.Parent = this;
+            return item;
         }
 
         /// <summary>