diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java
index 49702eae0a..6c84996dff 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java
@@ -101,8 +101,7 @@ public final class AutopsyTreeChildFactory extends ChildFactory.Detachable<Objec
                     return true;
                 } else {
                     // otherwise, just show host level
-                    Set<Host> hosts = tskCase.getHostManager().getHostsByStatus(HostStatus.ACTIVE);
-                    hosts.stream()
+                    tskCase.getHostManager().getHosts().stream()
                             .map(HostGrouping::new)
                             .sorted()
                             .forEach(list::add);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesByTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesByTypeNode.java
index 5fcd94cad2..856b6eec96 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesByTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesByTypeNode.java
@@ -74,7 +74,7 @@ public class DataSourcesByTypeNode extends DisplayableItemNode {
         @Override
         protected boolean createKeys(List<HostDataSources> toPopulate) {
             try {
-                Case.getCurrentCaseThrows().getSleuthkitCase().getHostManager().getHostsByStatus(HostStatus.ACTIVE).stream()
+                Case.getCurrentCaseThrows().getSleuthkitCase().getHostManager().getHosts().stream()
                         .map(HostDataSources::new)
                         .sorted()
                         .forEach(toPopulate::add);