1 files changed, 11 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index f9bf3446f..c95b30172 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1354,12 +1354,20 @@ namespace MediaBrowser.Server.Implementations.Library
                 AddUserToQuery(query, query.User);
             }
 
-            var initialResult = ItemRepository.GetItemIds(query);
+            if (query.EnableTotalRecordCount)
+            {
+                var initialResult = ItemRepository.GetItemIds(query);
+
+                return new QueryResult<BaseItem>
+                {
+                    TotalRecordCount = initialResult.TotalRecordCount,
+                    Items = initialResult.Items.Select(GetItemById).Where(i => i != null).ToArray()
+                };
+            }
 
             return new QueryResult<BaseItem>
             {
-                TotalRecordCount = initialResult.TotalRecordCount,
-                Items = initialResult.Items.Select(GetItemById).Where(i => i != null).ToArray()
+                Items = ItemRepository.GetItemIdsList(query).Select(GetItemById).Where(i => i != null).ToArray()
             };
         }