diff --git a/lib/alchemy/elements_finder.rb b/lib/alchemy/elements_finder.rb
index aa368dde3c..f9a39ec47c 100644
--- a/lib/alchemy/elements_finder.rb
+++ b/lib/alchemy/elements_finder.rb
@@ -54,8 +54,7 @@ def elements(page_version:)
     def find_elements(page_version)
       return Alchemy::ElementsRepository.none unless page_version
 
-      elements = Alchemy::ElementsRepository.new(page_version.elements.available)
-      elements = elements.not_nested
+      elements = page_version.element_repository.visible.not_nested
       elements = options[:fixed] ? elements.fixed : elements.unfixed
 
       if options[:only]