diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CommAccountsDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CommAccountsDAO.java
index 4fe26cbf0b..751f9ff3f0 100755
--- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CommAccountsDAO.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CommAccountsDAO.java
@@ -41,6 +41,7 @@ import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import static org.sleuthkit.autopsy.mainui.datamodel.AbstractDAO.CACHE_DURATION;
 import static org.sleuthkit.autopsy.mainui.datamodel.AbstractDAO.CACHE_DURATION_UNITS;
@@ -316,9 +317,15 @@ public class CommAccountsDAO extends AbstractDAO {
             }
         }
 
-        Stream<TreeEvent> treeEvents = this.accountCounts.enqueueAll(accountEvents).stream()
+        Stream<TreeEvent> treeEvents;
+        if (IngestManager.getInstance().isIngestRunning()) {
+            treeEvents = this.accountCounts.enqueueAll(accountEvents).stream()
                 .map(daoEvt -> new TreeEvent(createAccountTreeItem(daoEvt.getAccountType(), daoEvt.getDataSourceId(), TreeResultsDTO.TreeDisplayCount.INDETERMINATE), false));
-
+        } else {
+            treeEvents = accountEvents.stream()
+                .map(daoEvt -> new TreeEvent(createAccountTreeItem(daoEvt.getAccountType(), daoEvt.getDataSourceId(), TreeResultsDTO.TreeDisplayCount.INDETERMINATE), false));
+        }
+                
         return Stream.of(accountEvents.stream(), treeEvents)
                 .flatMap(s -> s)
                 .collect(Collectors.toSet());
diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CreditCardDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CreditCardDAO.java
index f2e5960640..17ee78b6e1 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CreditCardDAO.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/CreditCardDAO.java
@@ -45,6 +45,7 @@ import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
 import org.sleuthkit.autopsy.mainui.datamodel.TreeResultsDTO.TreeDisplayCount;
 import org.sleuthkit.autopsy.mainui.datamodel.TreeResultsDTO.TreeItemDTO;
@@ -467,10 +468,14 @@ public class CreditCardDAO extends AbstractDAO {
 
     /**
      * Returns counts of artifacts found for bin prefixes.
-     * @param dataSourceId The data source id to filter on or null for no filtering.
+     *
+     * @param dataSourceId    The data source id to filter on or null for no
+     *                        filtering.
      * @param includeRejected Whether or not to include rejected accounts.
+     *
      * @return The results to use in the tree.
-     * @throws ExecutionException 
+     *
+     * @throws ExecutionException
      */
     public TreeResultsDTO<CreditCardBinSearchParams> getCreditCardBinCounts(Long dataSourceId, boolean includeRejected) throws ExecutionException {
 
@@ -613,15 +618,24 @@ public class CreditCardDAO extends AbstractDAO {
             }
         }
 
-        List<TreeEvent> treeEvents = this.creditCardTreeCounts.enqueueAll(events).stream()
-                .flatMap(daoEvt -> {
-                    List<TreeItemDTO<CreditCardSearchParams>> treeItems = createTreeItems(daoEvt, TreeDisplayCount.INDETERMINATE);
-                    return treeItems.stream().map(item -> new TreeEvent(item, false));
-                })
-                .collect(Collectors.toList());
+        Stream<TreeEvent> treeEvents;
+        if (IngestManager.getInstance().isIngestRunning()) {
+            treeEvents = this.creditCardTreeCounts.enqueueAll(events).stream()
+                    .flatMap(daoEvt -> {
+                        List<TreeItemDTO<CreditCardSearchParams>> treeItems = createTreeItems(daoEvt, TreeDisplayCount.INDETERMINATE);
+                        return treeItems.stream().map(item -> new TreeEvent(item, false));
+                    });
 
-        return Stream.of(events, treeEvents)
-                .flatMap(s -> s.stream())
+        } else {
+            treeEvents = events.stream()
+                    .flatMap(daoEvt -> {
+                        List<TreeItemDTO<CreditCardSearchParams>> treeItems = createTreeItems(daoEvt, TreeDisplayCount.UNSPECIFIED);
+                        return treeItems.stream().map(item -> new TreeEvent(item, true));
+                    });
+        }
+
+        return Stream.of(events.stream(), treeEvents)
+                .flatMap(s -> s)
                 .collect(Collectors.toSet());
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java
index 6279fff01c..9f9debacbc 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java
@@ -232,7 +232,7 @@ public class DataArtifactDAO extends BlackboardArtifactDAO {
             dataArtifactTreeEvents = this.treeCounts.enqueueAll(dataArtifactEvents).stream()
                 .map(daoEvt -> new TreeEvent(createDataArtifactTreeItem(daoEvt.getArtifactType(), daoEvt.getDataSourceId(), TreeDisplayCount.INDETERMINATE), false));
         } else {
-            dataArtifactTreeEvents = this.treeCounts.enqueueAll(dataArtifactEvents).stream()
+            dataArtifactTreeEvents = dataArtifactEvents.stream()
                 .map(daoEvt -> new TreeEvent(createDataArtifactTreeItem(daoEvt.getArtifactType(), daoEvt.getDataSourceId(), TreeDisplayCount.UNSPECIFIED), true));
         }