diff --git a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
index b4901ae574..5b1505bb05 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java
@@ -42,6 +42,7 @@ import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.openide.util.NbBundle;
 import org.openide.util.NbBundle.Messages;
@@ -515,7 +516,7 @@ public class AnalysisResultDAO extends BlackboardArtifactDAO {
                             return getSetTreeItem(type,
                                     dataSourceId,
                                     entry.getKey(),
-                                    entry.getKey() == null ? nullSetName : entry.getKey(),
+                                    StringUtils.isBlank(entry.getKey()) ? nullSetName : entry.getKey(),
                                     displayCount);
                         })
                         .collect(Collectors.toList());
diff --git a/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java b/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java
index 893fa3d11c..a15fc0f44e 100644
--- a/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/mainui/nodes/AnalysisResultTypeFactory.java
@@ -23,6 +23,7 @@ import java.util.Comparator;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
+import org.apache.commons.lang3.StringUtils;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.util.NbBundle.Messages;
@@ -86,8 +87,7 @@ public class AnalysisResultTypeFactory extends TreeChildFactory<AnalysisResultSe
     protected TreeNode<AnalysisResultSearchParam> createNewNode(TreeResultsDTO.TreeItemDTO<? extends AnalysisResultSearchParam> rowData) {
         if (BlackboardArtifact.Type.TSK_KEYWORD_HIT.equals(rowData.getSearchParams().getArtifactType())) {
             return new TreeTypeNode(rowData, new KeywordSetFactory(dataSourceId));
-        } else if ((rowData instanceof AnalysisResultTreeItem && ((AnalysisResultTreeItem) rowData).getHasChildren().orElse(false))
-                || rowData.getSearchParams() instanceof AnalysisResultSetSearchParam) {
+        } else if (rowData instanceof AnalysisResultTreeItem && ((AnalysisResultTreeItem) rowData).getHasChildren().orElse(false)) {
             return new TreeTypeNode(rowData, new TreeSetFactory(rowData.getSearchParams().getArtifactType(), dataSourceId, Bundle.AnalysisResultTypeFactory_nullSetName()));
         } else {
             return new AnalysisResultTypeTreeNode(rowData);
@@ -107,7 +107,8 @@ public class AnalysisResultTypeFactory extends TreeChildFactory<AnalysisResultSe
             if (originalTreeItem instanceof AnalysisResultTreeItem) {
                 hasChildren = ((AnalysisResultTreeItem) originalTreeItem).getHasChildren().orElse(null);
             } else if (originalTreeItem.getSearchParams() instanceof AnalysisResultSetSearchParam) {
-                hasChildren = true;
+                String setName = ((AnalysisResultSetSearchParam) originalTreeItem.getSearchParams()).getSetName();
+                hasChildren = StringUtils.isNotBlank(setName);
             }
 
             // generate new type so that if it is a subtree event (i.e. keyword hits), the right tree item is created.