diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index 7b9686e1c4..6823e8f9f2 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -515,7 +515,10 @@ public class CommandLineIngestManager extends CommandLineManager {
                              * listener or until interrupted because auto ingest
                              * is shutting down.
                              */
-                            ingestLock.wait();
+                            do {
+                                ingestLock.wait();
+                            } while (IngestManager.getInstance().isIngestRunning());
+
                             LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath());
                             IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();
                             IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot();