1 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index a3f097f24..80a1b5e2a 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -20,6 +20,7 @@ using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -791,7 +792,7 @@ namespace MediaBrowser.Controller.Entities
             query.StartIndex = null;
             query.Limit = null;
 
-            var itemsList = LibraryManager.GetItemList(query);
+            IEnumerable<BaseItem> itemsList = LibraryManager.GetItemList(query);
             var user = query.User;
 
             if (user != null)
@@ -970,7 +971,7 @@ namespace MediaBrowser.Controller.Entities
             return GetItemsInternal(query);
         }
 
-        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query)
+        public BaseItem[] GetItemList(InternalItemsQuery query)
         {
             query.EnableTotalRecordCount = false;
 
@@ -983,9 +984,9 @@ namespace MediaBrowser.Controller.Entities
                     var ids = query.ItemIds.ToList();
 
                     // Try to preserve order
-                    result = result.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToArray();
+                    return result.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToArray();
                 }
-                return result;
+                return result.ToArray(result.Count);
             }
 
             return GetItemsInternal(query).Items;