diff --git a/registrasion/controllers/invoice.py b/registrasion/controllers/invoice.py
index 09eb02dad03020435bd42b7ea2d5d89cced848c8..d4be50b121af5c588cb4795b2fa5b73f615555e8 100644
--- a/registrasion/controllers/invoice.py
+++ b/registrasion/controllers/invoice.py
@@ -217,7 +217,9 @@ class InvoiceController(ForId, object):
         if invoices.count() > 1:
             return
 
-        notes = commerce.CreditNote.objects.filter(invoice__user=invoice.user)
+        notes = commerce.CreditNote.unclaimed().filter(
+            invoice__user=invoice.user
+        )
         for note in notes:
             try:
                 CreditNoteController(note).apply_to_invoice(invoice)