diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 1daa7af42df..b1f6f4ca123 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -6276,11 +6276,10 @@ class DatasetCollection(Base, Dictifiable, UsesAnnotations, Serializable):
             q = q.outerjoin(inner_dce, inner_dce.c.dataset_collection_id == dce.c.child_collection_id)
             if collection_attributes:
                 q = q.join(inner_dc, inner_dc.c.id == dce.c.child_collection_id)
-            q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level))
-            if collection_attributes:
                 q = q.add_columns(
                     *attribute_columns(inner_dc.c, collection_attributes, nesting_level),
                 )
+            q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level))
             dce = inner_dce
             dc = inner_dc
             depth_collection_type = depth_collection_type.split(":", 1)[1]