diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index 743c7fe648..1830dee3af 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -214,9 +214,9 @@ class OrderModify(EventViewMixin, OrderDetailMixin, QuestionsViewMixin, Template
 
     @cached_property
     def invoice_address(self):
-        if self.order.invoice_address:
+        try:
             return self.order.invoice_address
-        else:
+        except InvoiceAddress.DoesNotExist:
             return InvoiceAddress(order=self.order)
 
     @cached_property