diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php
index 8c6d1ded6151cf54d56b1cd3f08b8a31fdaabe0b..1ece965441779ce635ffa27cbada4890ea66e60e 100644
--- a/lib/models/Courseware/StructuralElement.php
+++ b/lib/models/Courseware/StructuralElement.php
@@ -625,7 +625,8 @@ class StructuralElement extends \SimpleORMap implements \PrivacyObject
 
     private function findCoursewareElements($user): array
     {
-        $root = $this->getCourseware($this->range_id, $this->range_type);
+        $unit = $this->findUnit();
+        $root = $unit->structural_element;
         $elements = array_merge([$root], $root->findDescendants($user));
 
         return $elements;