diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py
index 69d33a318e..766e5bd021 100644
--- a/src/pretix/base/services/cart.py
+++ b/src/pretix/base/services/cart.py
@@ -447,7 +447,10 @@ class CartManager:
         try:
             voucher = self.event.vouchers.get(code__iexact=voucher_code.strip())
         except Voucher.DoesNotExist:
-            raise CartError(error_messages['voucher_invalid'])
+            if self.event.organizer.accepted_gift_cards.filter(secret__iexact=voucher_code).exists():
+                raise CartError(error_messages['gift_card'])
+            else:
+                raise CartError(error_messages['voucher_invalid'])
         voucher_use_diff = Counter()
         ops = []