diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html
index 4e1e7c4e3..6d5040fbb 100644
--- a/src/pretix/control/templates/pretixcontrol/order/index.html
+++ b/src/pretix/control/templates/pretixcontrol/order/index.html
@@ -402,9 +402,9 @@
                                             </dt>
                                             <dd>
                                                 {% if line.street or line.zipcode or line.city or line.country %}
-                                                    {{ line.street|linebreaksbr }}<br>
-                                                    {{ line.zipcode }} {{ line.city }}<br>
-                                                    {{ line.country.name }}
+                                                    {{ line.street|default_if_none:""|linebreaksbr }}<br>
+                                                    {{ line.zipcode|default_if_none:"" }} {{ line.city|default_if_none:"" }}<br>
+                                                    {{ line.country.name|default_if_none:"" }}
                                                     {% if line.state %}<br>{{ line.state }}{% endif %}
                                                 {% else %}
                                                     <em>{% trans "not answered" %}</em>
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 64c09c116..359f18542 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -63,6 +63,9 @@
                             </span>
                         </dd>
                     {% endif %}
+                    {% if line.item.admission and event.settings.attendee_addresses_asked %}
+                        <br>
+                    {% endif %}
                     {% if line.item.admission and event.settings.attendee_company_asked %}
                         <dt class="sr-only">
                             {% trans "Attendee company" %}
@@ -80,9 +83,9 @@
                         <dd class="toplevel">
                             <span data-toggle="tooltip" title="{% trans "Attendee address" %}">
                                 {% if line.street or line.zipcode or line.city or line.country %}
-                                    {{ line.street|linebreaksbr }}<br>
-                                    {{ line.zipcode }} {{ line.city }}<br>
-                                    {{ line.country.name }}
+                                    {{ line.street|default_if_none:""|linebreaksbr }}<br>
+                                    {{ line.zipcode|default_if_none:"" }} {{ line.city|default_if_none:"" }}<br>
+                                    {{ line.country.name|default_if_none:"" }}
                                     {% if line.state %}<br>{{ line.state }}{% endif %}
                                 {% else %}
                                     <em>{% trans "not answered" %}</em>