diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
index 04db79ec6..38c50af59 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import javax.servlet.ServletContext;
 
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -86,7 +87,7 @@ public class SearchIndexerImpl implements SearchIndexer {
 
 	private final ListenerList listeners = new ListenerList();
 	private final TaskQueue taskQueue = new TaskQueue();
-	private final Scheduler scheduler = new Scheduler(taskQueue);
+	private final Scheduler scheduler = new Scheduler(this, taskQueue);
 
 	private Integer threadPoolSize;
 	private WorkerThreadPool pool;
@@ -245,10 +246,7 @@ public class SearchIndexerImpl implements SearchIndexer {
 			return;
 		}
 
-		Task task = new UpdateStatementsTask(changes, createFindersList(),
-				createExcludersList(), createModifiersList(),
-				wadf.getIndividualDao(), listeners, pool);
-		scheduler.scheduleTask(task);
+		scheduler.scheduleTask(new UpdateStatementsTask.Deferrable(changes));
 		log.debug("Scheduled updates for " + changes.size() + " statements.");
 	}
 
@@ -262,9 +260,7 @@ public class SearchIndexerImpl implements SearchIndexer {
 			return;
 		}
 
-		Task task = new UpdateUrisTask(uris, createExcludersList(),
-				createModifiersList(), wadf.getIndividualDao(), listeners, pool);
-		scheduler.scheduleTask(task);
+		scheduler.scheduleTask(new UpdateUrisTask.Deferrable(uris));
 		log.debug("Scheduled updates for " + uris.size() + " uris.");
 	}
 
@@ -274,9 +270,7 @@ public class SearchIndexerImpl implements SearchIndexer {
 			log.warn("Call to rebuildIndex after shutdown.");
 		}
 
-		Task task = new RebuildIndexTask(createExcludersList(),
-				createModifiersList(), wadf.getIndividualDao(), listeners, pool);
-		scheduler.scheduleTask(task);
+		scheduler.scheduleTask(new RebuildIndexTask.Deferrable());
 		log.debug("Scheduled a full rebuild.");
 	}
 
@@ -372,13 +366,15 @@ public class SearchIndexerImpl implements SearchIndexer {
 	 */
 	private static class Scheduler {
 		private final TaskQueue taskQueue;
-		private final List<Task> deferredQueue;
+		private final List<DeferrableTask> deferredQueue;
+        private final SearchIndexerImpl indexer;
 		private volatile boolean started;
 		private volatile boolean paused;
 
-		public Scheduler(TaskQueue taskQueue) {
+		public Scheduler(SearchIndexerImpl indexer, TaskQueue taskQueue) {
+            this.indexer = indexer;
 			this.taskQueue = taskQueue;
-			this.deferredQueue = new ArrayList<Task>();
+			this.deferredQueue = new ArrayList<DeferrableTask>();
 		}
 
 		public boolean isStarted() {
@@ -389,14 +385,21 @@ public class SearchIndexerImpl implements SearchIndexer {
 			return paused;
 		}
 
+        public synchronized void scheduleTask(DeferrableTask task) {
+            if (paused || !started) {
+                deferredQueue.add(task);
+                log.debug("added task to deferred queue: " + task);
+            } else {
+                taskQueue.scheduleTask(task.makeRunnable(indexer.createFindersList(), indexer.createExcludersList(), indexer.createModifiersList(), indexer.wadf.getIndividualDao(), indexer.listeners, indexer.pool));
+            }
+        }
 		public synchronized void scheduleTask(Task task) {
-			if (paused || !started) {
-				deferredQueue.add(task);
-				log.debug("added task to deferred queue: " + task);
-			} else {
+			if (started && !paused) {
 				taskQueue.scheduleTask(task);
 				log.debug("added task to task queue: " + task);
-			}
+			} else {
+                log.debug("indexer not running, task ignored: " + task);
+            }
 		}
 
 		public synchronized void start() {
@@ -418,11 +421,14 @@ public class SearchIndexerImpl implements SearchIndexer {
 		}
 
 		private void processDeferredTasks() {
-			for (Task task : deferredQueue) {
-				taskQueue.scheduleTask(task);
+			for (DeferrableTask task : deferredQueue) {
+                taskQueue.scheduleTask(task.makeRunnable(indexer.createFindersList(), indexer.createExcludersList(), indexer.createModifiersList(), indexer.wadf.getIndividualDao(), indexer.listeners, indexer.pool));
 				log.debug("moved task from deferred queue to task queue: "
 						+ task);
 			}
+
+            // Empty out the deferred queue as we've now processed it
+            deferredQueue.clear();
 		}
 
 	}
@@ -525,6 +531,12 @@ public class SearchIndexerImpl implements SearchIndexer {
 		}
 	}
 
+    public static interface DeferrableTask {
+        public Task makeRunnable(IndexingUriFinderList uriFinders, SearchIndexExcluderList excluders,
+                                 DocumentModifierList modifiers, IndividualDao indDao,
+                                 ListenerList listeners, WorkerThreadPool pool);
+    }
+
 	public static interface Task extends Runnable {
 		public SearchIndexerStatus getStatus();
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java
index 60be6dc7e..9cc89d6ed 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java
@@ -10,6 +10,8 @@ import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
 
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl;
+import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinderList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -22,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Even
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.RebuildCounts;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.State;
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.DeferrableTask;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.ListenerList;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.Task;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.WorkerThreadPool;
@@ -50,6 +53,15 @@ public class RebuildIndexTask implements Task {
 
 	private volatile SearchIndexerStatus status;
 
+    public static class Deferrable implements DeferrableTask {
+        public Deferrable() {}
+
+        @Override
+        public Task makeRunnable(IndexingUriFinderList uriFinders, SearchIndexExcluderList excluders, DocumentModifierList modifiers, IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+            return new RebuildIndexTask(excluders, modifiers, indDao, listeners, pool);
+        }
+    }
+
 	public RebuildIndexTask(SearchIndexExcluderList excluders,
 			DocumentModifierList modifiers, IndividualDao indDao,
 			ListenerList listeners, WorkerThreadPool pool) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java
index b6aa98894..020fda35a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java
@@ -14,6 +14,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -23,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Event;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexerStatus.StatementCounts;
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.DeferrableTask;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.ListenerList;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.Task;
 import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl.WorkerThreadPool;
@@ -63,7 +65,18 @@ public class UpdateStatementsTask implements Task {
 	private final Set<String> uris;
 	private final Status status;
 
-	public UpdateStatementsTask(List<Statement> changes,
+    public static class Deferrable implements DeferrableTask {
+        List<Statement> changes;
+
+        public Deferrable(List<Statement> changes) { this.changes = changes; }
+
+        @Override
+        public Task makeRunnable(IndexingUriFinderList uriFinders, SearchIndexExcluderList excluders, DocumentModifierList modifiers, IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+            return new UpdateStatementsTask(changes, uriFinders, excluders, modifiers, indDao, listeners, pool);
+        }
+    }
+
+    public UpdateStatementsTask(List<Statement> changes,
 			IndexingUriFinderList uriFinders,
 			SearchIndexExcluderList excluders, DocumentModifierList modifiers,
 			IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java
index 3b61e29b0..0e8aba65c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java
@@ -13,6 +13,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerImpl;
+import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinderList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -61,7 +63,17 @@ public class UpdateUrisTask implements Task {
 	private final Status status;
 	private final SearchEngine searchEngine;
 
-	public UpdateUrisTask(Collection<String> uris,
+    public static class Deferrable implements SearchIndexerImpl.DeferrableTask {
+        Collection<String> uris;
+        public Deferrable(Collection<String> uris) { this.uris = uris; }
+
+        @Override
+        public Task makeRunnable(IndexingUriFinderList uriFinders, SearchIndexExcluderList excluders, DocumentModifierList modifiers, IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
+            return new UpdateUrisTask(uris, excluders, modifiers, indDao, listeners, pool);
+        }
+    }
+
+    public UpdateUrisTask(Collection<String> uris,
 			SearchIndexExcluderList excluders, DocumentModifierList modifiers,
 			IndividualDao indDao, ListenerList listeners, WorkerThreadPool pool) {
 		this.uris = new HashSet<>(uris);