diff --git a/app/controllers/extranet/academic_years_controller.rb b/app/controllers/extranet/academic_years_controller.rb
index a8439fd6ed87c6cfaaa3900373e67f628c97e7f3..bdae2dcb1dc27b5b104e20c7c23cadf46b6cdc4e 100644
--- a/app/controllers/extranet/academic_years_controller.rb
+++ b/app/controllers/extranet/academic_years_controller.rb
@@ -4,7 +4,7 @@ class Extranet::AcademicYearsController < Extranet::ApplicationController
                               through_association: :academic_years
 
   def index
-    @academic_years = @academic_years.ordered.page(params[:page])
+    @academic_years = current_context.about&.academic_years || @academic_years
     breadcrumb
   end
 
diff --git a/app/views/extranet/academic_years/_list.html.erb b/app/views/extranet/academic_years/_list.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..54b14810da7c0e8e3246fbca8a5f1a37bc0fec43
--- /dev/null
+++ b/app/views/extranet/academic_years/_list.html.erb
@@ -0,0 +1,22 @@
+<% academic_years_paged = academic_years.ordered.page(params[:page]).per(60) %>
+<div class="row">
+  <% academic_years_paged.each do |year| %>
+    <div class="col-md-3">
+      <article class="card mb-4">
+        <div class="card-body">
+          <h2 class="mb-5">
+            <%= link_to year, year, class: 'stretched-link' %>
+          </h2>
+          <p class="text-end mb-0">
+            <%= year.cohorts.count %>
+            <%= Education::Cohort.model_name.human(count: year.cohorts.count).downcase %>
+            <br>
+            <%= year.people.count %>
+            <%= University::Person::Alumnus.model_name.human(count: year.people.count).downcase %>
+          </p>
+        </div>
+      </article>
+    </div>
+  <% end %>
+</div>
+<%= paginate academic_years_paged, theme: 'bootstrap-5' %>
diff --git a/app/views/extranet/academic_years/index.html.erb b/app/views/extranet/academic_years/index.html.erb
index 6c079cc94e1f15e56a8898ffd139820ffb5ee012..b524bf9aa66c944c29e02c51287994406e9f26ba 100644
--- a/app/views/extranet/academic_years/index.html.erb
+++ b/app/views/extranet/academic_years/index.html.erb
@@ -4,23 +4,4 @@
   <h1><%= Education::AcademicYear.model_name.human(count: 2) %></h1>
 </header>
 
-<div class="row">
-  <% @academic_years.each do |year| %>
-    <div class="col-md-3">
-      <article class="card mb-4">
-        <div class="card-body">
-          <h2 class="mb-5">
-            <%= link_to year, year, class: 'stretched-link' %>
-          </h2>
-          <p class="text-end mb-0">
-            <%= year.cohorts.count %>
-            <%= Education::Cohort.model_name.human(count: year.cohorts.count).downcase %>
-            <br>
-            <%= year.people.count %>
-            <%= University::Person::Alumnus.model_name.human(count: year.people.count).downcase %>
-          </p>
-        </div>
-      </article>
-    </div>
-  <% end %>
-</div>
+<%= render 'extranet/academic_years/list', academic_years: @academic_years %>
diff --git a/app/views/extranet/persons/_list.html.erb b/app/views/extranet/persons/_list.html.erb
index 577ec80f7ff386520578e4c2ae242985d3094af9..7922cd391743569fccc61271a420850d8171c7c8 100644
--- a/app/views/extranet/persons/_list.html.erb
+++ b/app/views/extranet/persons/_list.html.erb
@@ -1,6 +1,4 @@
-<%
-people_paged = people.ordered.page(params[:page]).per(60)
-%>
+<% people_paged = people.ordered.page(params[:page]).per(60) %>
 <div class="row">
   <% people_paged.each do |person| %>
     <div class="col-xxl-2 col-md-3">