diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestTasksScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestTasksScheduler.java
index 2bc1769bc6..36b09035b1 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestTasksScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestTasksScheduler.java
@@ -166,7 +166,7 @@ final class IngestTasksScheduler {
      */
     synchronized void scheduleFileIngestTasks(DataSourceIngestJob job, Collection<AbstractFile> files) {
         if (!job.isCancelled()) {
-            List<FileIngestTask> newTasks = new LinkedList<>();
+            List<FileIngestTask> newTasksForFileIngestThreads = new LinkedList<>();
             for (AbstractFile file : files) {
                 /*
                  * Put the file directly into the queue for the file ingest
@@ -178,7 +178,7 @@ final class IngestTasksScheduler {
                  */
                 FileIngestTask task = new FileIngestTask(job, file);
                 if (shouldEnqueueFileTask(task)) {
-                    newTasks.add(task);
+                    newTasksForFileIngestThreads.add(task);
                 }
 
                 /*
@@ -196,7 +196,7 @@ final class IngestTasksScheduler {
                             if (childFile.hasChildren()) {
                                 this.directoryFileTaskQueue.add(childTask);
                             } else if (shouldEnqueueFileTask(childTask)) {
-                                newTasks.add(task);
+                                newTasksForFileIngestThreads.add(task);
                             }
                         }
                     }
@@ -211,7 +211,7 @@ final class IngestTasksScheduler {
              * method is adding derived files from a higher priority task that
              * preceded the tasks currently in the queue.
              */
-            for (FileIngestTask newTask : newTasks) {
+            for (FileIngestTask newTask : newTasksForFileIngestThreads) {
                 try {
                     this.queuedAndRunningFileTasks.add(newTask);
                     this.fileTaskQueueForIngestThreads.addFirst(newTask);
@@ -351,7 +351,7 @@ final class IngestTasksScheduler {
      * queue more tasks for the file ingest threads.
      */
     synchronized private void shuffleFileTaskQueues() {
-        List<FileIngestTask> newTasks = new LinkedList<>();
+        List<FileIngestTask> newTasksForFileIngestThreads = new LinkedList<>();
         while (this.queuedAndRunningFileTasks.isEmpty()) {
             /*
              * If the directory file task queue is empty, move the highest
@@ -375,7 +375,8 @@ final class IngestTasksScheduler {
              */
             final FileIngestTask directoryTask = this.directoryFileTaskQueue.pollLast();
             if (shouldEnqueueFileTask(directoryTask)) {
-                newTasks.add(directoryTask);
+                newTasksForFileIngestThreads.add(directoryTask);
+                this.queuedAndRunningFileTasks.add(directoryTask);
             }
 
             /*
@@ -395,7 +396,8 @@ final class IngestTasksScheduler {
                         if (childFile.hasChildren()) {
                             this.directoryFileTaskQueue.add(childTask);
                         } else if (shouldEnqueueFileTask(childTask)) {
-                            newTasks.add(childTask);
+                            newTasksForFileIngestThreads.add(childTask);
+                            this.queuedAndRunningFileTasks.add(childTask);
                         }
                     }
                 }
@@ -408,9 +410,8 @@ final class IngestTasksScheduler {
          * The files are added to the queue for the ingest threads AFTER the
          * higher priority tasks that preceded them.
          */
-        for (FileIngestTask newTask : newTasks) {
+        for (FileIngestTask newTask : newTasksForFileIngestThreads) {
             try {
-                this.queuedAndRunningFileTasks.add(newTask);
                 this.fileTaskQueueForIngestThreads.addFirst(newTask);
             } catch (InterruptedException ex) {
                 this.queuedAndRunningFileTasks.remove(newTask);