diff --git a/app/models/communication/block/template/page.rb b/app/models/communication/block/template/page.rb
index fd6d8079bcae2603c921bee83391b1aa62f81c21..dd60b571e3c046c63e06f055ddbece03b4b1b140 100644
--- a/app/models/communication/block/template/page.rb
+++ b/app/models/communication/block/template/page.rb
@@ -1,6 +1,6 @@
 class Communication::Block::Template::Page < Communication::Block::Template
   def build_git_dependencies
-    add_dependency main_page.page
+    add_dependency main_page
     selected_pages.each do |hash|
       page = hash.page
       add_dependency page
@@ -9,7 +9,11 @@ class Communication::Block::Template::Page < Communication::Block::Template
   end
 
   def selected_pages
-    @selected_pages ||= free_pages
+    @selected_pages ||= elements.map { |element|
+      p = page(element['id'])
+      next if p.nil?
+      hash_from_page(p, element)
+    }.compact
   end
 
   def main_page
@@ -26,14 +30,6 @@ class Communication::Block::Template::Page < Communication::Block::Template
 
   protected
 
-  def free_pages
-    elements.map { |element|
-      p = page(element['id'])
-      next if p.nil?
-      hash_from_page(p, element)
-    }.compact
-  end
-
   def hash_from_page(page, element)
     {
       page: page,