diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py
index 6201a9749e..ffd35e9e96 100644
--- a/src/pretix/base/services/cart.py
+++ b/src/pretix/base/services/cart.py
@@ -940,7 +940,8 @@ def get_fees(event, request, total, invoice_address, provider):
 
     for recv, resp in fee_calculation_for_cart.send(sender=event, request=request, invoice_address=invoice_address,
                                                     total=total):
-        fees += resp
+        if resp:
+            fees += resp
 
     total = total + sum(f.value for f in fees)
     if provider and total != 0:
diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py
index f9fcef9b93..33a406b494 100644
--- a/src/pretix/base/services/orders.py
+++ b/src/pretix/base/services/orders.py
@@ -594,7 +594,8 @@ def _get_fees(positions: List[CartPosition], payment_provider: BasePaymentProvid
 
     for recv, resp in order_fee_calculation.send(sender=event, invoice_address=address, total=total,
                                                  meta_info=meta_info, positions=positions):
-        fees += resp
+        if resp:
+            fees += resp
 
     total += sum(f.value for f in fees)
     if payment_provider: