diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
index 2ce5b9f9c1..4c5e011efa 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
@@ -41,7 +41,7 @@ public class AdminGradingTemplatesOverviewPage extends AbstractAdminProjectPage
             IModel<GradingReportTemplate> currentTemplate = model.map(gradingReportTemplateService::getCurrentTemplate);
 
             add(new Label("valid_from", currentTemplate.map(GradingReportTemplate::getValidFrom)));
-            add(new NonEmptyLabel("note", Model.of("")));
+            add(new NonEmptyLabel("note", currentTemplate.map(GradingReportTemplate::getNote)));
             add(new BookmarkablePageLink<>("view_template", AdminGradingTemplatePage.class, AdminGradingTemplatePage.getPageParameters(currentTemplate.getObject())));
 
             IModel<List<GradingReportTemplate>> upcomingTemplates = model.map(gradingReportTemplateService::getUpcomingTemplates);
@@ -49,7 +49,7 @@ public class AdminGradingTemplatesOverviewPage extends AbstractAdminProjectPage
                 @Override
                 protected void populateItem(ListItem<GradingReportTemplate> item) {
                     item.add(new Label("valid_from", item.getModel().map(GradingReportTemplate::getValidFrom)));
-                    item.add(new NonEmptyLabel("note", Model.of("")));
+                    item.add(new NonEmptyLabel("note", item.getModel().map(GradingReportTemplate::getNote)));
                     item.add(new BookmarkablePageLink<>("edit_template", AdminGradingTemplateEditPage.class, AdminGradingTemplateEditPage.getPageParameters(item.getModelObject())));
                 }
             });