diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
index 57c890d7d..ce8290984 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
@@ -99,7 +99,7 @@
                                     <dt>{% trans "State" context "address" %}</dt>
                                     <dd>{{ addr.state_name }}</dd>
                                 {% endif %}
-                                {% if request.event.settings.invoice_address_vatid %}
+                                {% if request.event.settings.invoice_address_vatid and addr.vat_id %}
                                     <dt>{% trans "VAT ID" %}</dt>
                                     <dd>{{ addr.vat_id }}</dd>
                                 {% endif %}
@@ -111,8 +111,10 @@
                                     <dt>{{ request.event.settings.invoice_address_custom_field }}</dt>
                                     <dd>{{ addr.custom_field }}</dd>
                                 {% endif %}
-                                <dt>{% trans "Internal reference" %}</dt>
-                                <dd>{{ addr.internal_reference }}</dd>
+                                {% if addr.internal_reference %}
+                                    <dt>{% trans "Internal reference" %}</dt>
+                                    <dd>{{ addr.internal_reference }}</dd>
+                                {% endif %}
                             </dl>
                         </div>
                     </div>
diff --git a/src/pretix/presale/templates/pretixpresale/event/order.html b/src/pretix/presale/templates/pretixpresale/event/order.html
index f8cb03388..63f8fa6ca 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order.html
@@ -321,7 +321,7 @@
                                 <dt>{% trans "State" context "address" %}</dt>
                                 <dd>{{ order.invoice_address.state_name }}</dd>
                             {% endif %}
-                            {% if request.event.settings.invoice_address_vatid %}
+                            {% if request.event.settings.invoice_address_vatid and order.invoice_address.vat_id %}
                                 <dt>{% trans "VAT ID" %}</dt>
                                 <dd>{{ order.invoice_address.vat_id }}</dd>
                             {% endif %}
@@ -329,8 +329,10 @@
                                 <dt>{{ request.event.settings.invoice_address_custom_field }}</dt>
                                 <dd>{{ order.invoice_address.custom_field }}</dd>
                             {% endif %}
-                            <dt>{% trans "Internal Reference" %}</dt>
-                            <dd>{{ order.invoice_address.internal_reference }}</dd>
+                            {% if order.invoice_address.internal_reference %}
+                                <dt>{% trans "Internal Reference" %}</dt>
+                                <dd>{{ order.invoice_address.internal_reference }}</dd>
+                            {% endif %}
                         {% endif %}
                     </dl>
                 </div>