diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index e628fecb509ea4a897eae693a0d1403f435a27fa..d681e04addb79970530528058a82a4934d6d8f0f 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -182,6 +182,7 @@ class Documentation(CalendarEvent):
                     )
                 ):
                     continue
+                doc._amends_prefetched = event_reference_obj
                 docs.append(doc)
             elif not absences_exist:
                 if event_reference_obj.amends:
diff --git a/aleksis/apps/alsijil/schema/documentation.py b/aleksis/apps/alsijil/schema/documentation.py
index b833de336b2a2add64ac5f0e0cf6dd7fdd8ae0c5..fe45b7fb248a59da62a95e07063e19732626dc91 100644
--- a/aleksis/apps/alsijil/schema/documentation.py
+++ b/aleksis/apps/alsijil/schema/documentation.py
@@ -32,7 +32,6 @@ class DocumentationType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectTyp
         fields = (
             "id",
             "course",
-            "amends",
             "subject",
             "topic",
             "homework",
@@ -61,6 +60,12 @@ class DocumentationType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectTyp
 
     old_id = graphene.ID(required=False)
 
+    @staticmethod
+    def resolve_amends(root: Documentation, info, **kwargs):
+        if hasattr(root, "_amends_prefetched"):
+            return root._amends_prefetched
+        return root.amends
+
     @staticmethod
     def resolve_teachers(root: Documentation, info, **kwargs):
         if not str(root.pk).startswith("DUMMY") and hasattr(root, "teachers"):