diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py
index 4c60b67a25..b59624dff1 100644
--- a/src/pretix/base/models/orders.py
+++ b/src/pretix/base/models/orders.py
@@ -1186,7 +1186,7 @@ class AbstractPosition(models.Model):
             self.attendee_name,
             self.company,
             self.street,
-            self.zipcode + ' ' + (self.city or '') + ' ' + (self.state_for_address or ''),
+            (self.zipcode or '') + ' ' + (self.city or '') + ' ' + (self.state_for_address or ''),
             self.country.name
         ]
         lines = [r.strip() for r in lines if r]