diff --git a/app/views/admin/education/diplomas/_programs.html.erb b/app/views/admin/education/diplomas/_programs.html.erb
index 4c09f0ee6702c4d6147a85be83561e01be08aeb4..fc7f42ca78ed0c1d93702b68a00ccede81550ffb 100644
--- a/app/views/admin/education/diplomas/_programs.html.erb
+++ b/app/views/admin/education/diplomas/_programs.html.erb
@@ -1,13 +1,14 @@
-<%
-indentation = ' ' * depth
+<% 
+depth ||= 2
+indentation = ' ' * depth 
 %>
 <% programs.each do |program| %>
 <%= indentation %>- label: >
 <%= indentation %>    <%= program.to_s %>
 <%= indentation %>  path: "<%= program.current_permalink_in_website(@website)&.path %>"
-<% children = program.children.ordered %>
+<% children = program.children.where(diploma: diploma).ordered %>
 <% if children.any? %>
 <%= indentation %>  children: 
-<%= render 'admin/education/diplomas/programs', programs: program.children.ordered, depth: depth + 4 %>
+<%= render 'admin/education/diplomas/programs', diploma: diploma, programs: children, depth: depth + 4 %>
 <% end %>
 <% end %>
diff --git a/app/views/admin/education/diplomas/static.html.erb b/app/views/admin/education/diplomas/static.html.erb
index 38deaae71596f480531d5c7a4a93cf8c55948c33..b0c0c08dcf5be36dcb09edb18b9d00b68e6aeebb 100644
--- a/app/views/admin/education/diplomas/static.html.erb
+++ b/app/views/admin/education/diplomas/static.html.erb
@@ -3,12 +3,10 @@ title: >
   <%= prepare_text_for_static @about.name %>
 <%= render 'admin/application/static/permalink' if @website %>
 <%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
-<% 
-if @website 
-  @programs = @website.education_programs.root.ordered
-%>
+<% if @website 
+  @programs = @website.education_programs.where(diploma: @about).root.ordered %>
 programs:
-<%= render 'admin/education/diplomas/programs', programs: @programs, depth: 2 %>
+<%= render 'admin/education/diplomas/programs', diploma: @about, programs: @programs %>
 <% end %>
 short_name: >
   <%= prepare_text_for_static @about.short_name %>