diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py
index 405544d10b..6c641cd7ad 100644
--- a/src/pretix/base/models/orders.py
+++ b/src/pretix/base/models/orders.py
@@ -828,7 +828,7 @@ class Order(LockModel, LoggedModel):
                 if cp.has_checkin:
                     return False
 
-        if self.event.settings.get('invoice_address_asked', as_type=bool):
+        if self.event.settings.get('invoice_address_asked', as_type=bool) or self.event.settings.get('invoice_name_required', as_type=bool):
             return True
         ask_names = self.event.settings.get('attendee_names_asked', as_type=bool)
         for cp in positions:
diff --git a/src/tests/base/test_models.py b/src/tests/base/test_models.py
index daf8f214b1..6a0963a5f7 100644
--- a/src/tests/base/test_models.py
+++ b/src/tests/base/test_models.py
@@ -1226,6 +1226,9 @@ class OrderTestCase(BaseQuotaTestCase):
         assert not self.order.can_modify_answers
         self.event.settings.set('invoice_address_asked', True)
         assert self.order.can_modify_answers
+        self.event.settings.set('invoice_address_asked', False)
+        self.event.settings.set('invoice_name_required', True)
+        assert self.order.can_modify_answers
         q = Question.objects.create(question='Foo', type=Question.TYPE_BOOLEAN, event=self.event)
         self.item1.questions.add(q)
         assert self.order.can_modify_answers