diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
index 5542970db..03146cdab 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
@@ -63,9 +63,21 @@ namespace Orchard.Indexing.Settings {
         }
 
         private void CreateTasksForType(string type) {
-            foreach (var contentItem in _contentManager.Query(VersionOptions.Published, new [] { type }).List()) {
-                _indexingTaskManager.CreateUpdateIndexTask(contentItem);
-            }
+            var index = 0;
+            bool contentItemProcessed;
+
+            // todo: load ids only, or create a queued job
+
+            do {
+                contentItemProcessed = false;
+                var contentItemsToIndex = _contentManager.Query(VersionOptions.Published, new [] { type }).Slice(index, 50);
+
+                foreach (var contentItem in contentItemsToIndex) {
+                    contentItemProcessed = true;
+                    _indexingTaskManager.CreateUpdateIndexTask(contentItem);
+                }
+
+            } while (contentItemProcessed);
         }
     }
 }
\ No newline at end of file