diff --git a/src/org/labkey/snd/SNDManager.java b/src/org/labkey/snd/SNDManager.java
index f7cf668..4392d6c 100644
--- a/src/org/labkey/snd/SNDManager.java
+++ b/src/org/labkey/snd/SNDManager.java
@@ -4044,14 +4044,12 @@ private Map<Integer, List<EventData>> getBulkEventData(Container c, Map<Integer,
 
             addExtraFieldsToEventData(eventData, eventDataExtraFields, extraFields);
 
-            boolean isEmptyEventDataAndHasChildPackages =
+            boolean hasEmptySubpackages =
                     includeEmptySubPackages
                     &&
-                    !originalEventDataIds.contains(eventData.getEventDataId())
-                    &&
                     !superPackagesByEventDataId.get(eventData.getEventDataId()).getChildPackages().isEmpty();
 
-            Map<Integer, Map<Integer, SuperPackage>> nextLevelSuperPkgs = getNextLevelEventDataSuperPkgs(eventData, childEventData, currentLevelSuperPkgs, includeEmptySubPackages, isEmptyEventDataAndHasChildPackages);
+            Map<Integer, Map<Integer, SuperPackage>> nextLevelSuperPkgs = getNextLevelEventDataSuperPkgs(eventData, childEventData, currentLevelSuperPkgs, includeEmptySubPackages, hasEmptySubpackages);
 
             if (nextLevelSuperPkgs != null && !nextLevelSuperPkgs.isEmpty()) {
                 // Recursion for next child level of sub packages