diff --git a/src/main/java/alfio/model/TicketReservation.java b/src/main/java/alfio/model/TicketReservation.java
index dfd77e3649..301234850f 100644
--- a/src/main/java/alfio/model/TicketReservation.java
+++ b/src/main/java/alfio/model/TicketReservation.java
@@ -143,6 +143,10 @@ public boolean getHasBeenPaid() {
         return status == TicketReservationStatus.COMPLETE;
     }
 
+    public boolean getHasVatNumber() {
+        return StringUtils.isNotEmpty(vatNr);
+    }
+
     public List<String> getLineSplittedBillingAddress() {
         if(billingAddress == null) {
             return Collections.emptyList();
diff --git a/src/main/resources/alfio/templates/invoice.ms b/src/main/resources/alfio/templates/invoice.ms
index 7288054030..c221e0b015 100644
--- a/src/main/resources/alfio/templates/invoice.ms
+++ b/src/main/resources/alfio/templates/invoice.ms
@@ -129,7 +129,7 @@
                     <p>{{.}}</p>
                     {{/ticketReservation.lineSplittedBillingAddress}}
                     {{/ticketReservation.hasBillingAddress}}
-                    {{^orderSummary.displayVat}}{{#i18n}}invoice.vat{{/i18n}} {{ticketReservation.vatNr}}{{/orderSummary.displayVat}}
+                    {{#ticketReservation.hasVatNumber}}{{#i18n}}invoice.vat{{/i18n}} {{ticketReservation.vatNr}}{{/ticketReservation.hasVatNumber}}
                 </td>
             </tr>
         </table>
diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
index 894d31239a..71de737cbc 100644
--- a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
+++ b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
@@ -324,13 +324,7 @@
             <div class="col-xs-12 {{#vatNrIsLinked}}col-md-8{{/vatNrIsLinked}}">
                 <div class="form-group {{#field-has-error}}[billingAddress] has-error{{/field-has-error}}" id="billing-address-container">
                     <label for="billing-address" class="control-label">{{#i18n}}{{billingAddressLabel}}{{/i18n}}</label>
-                    {{^vatNrIsLinked}}
                     <textarea name="billingAddress" id="billing-address" class="form-control" maxlength="450" {{#invoiceIsAllowed}}data-invoice-enabled="true"{{/invoiceIsAllowed}}>{{paymentForm.billingAddress}}</textarea>
-                    {{/vatNrIsLinked}}
-                    {{#vatNrIsLinked}}
-                    <input type="hidden" name="billingAddress" value="{{paymentForm.billingAddress}}"/>
-                    <div class="form-control-static preformatted">{{paymentForm.billingAddress}}</div>
-                    {{/vatNrIsLinked}}
                     {{#field-has-error}}[billingAddress]<span class="help-block text-danger">{{#i18n}}{{#field-error}}billingAddress{{/field-error}}{{/i18n}}</span>{{/field-has-error}}
                 </div>
             </div>
diff --git a/src/main/webapp/resources/js/event/reservation-page.js b/src/main/webapp/resources/js/event/reservation-page.js
index fc9d60db5d..4ddd7654bc 100644
--- a/src/main/webapp/resources/js/event/reservation-page.js
+++ b/src/main/webapp/resources/js/event/reservation-page.js
@@ -294,7 +294,7 @@
 
 
         function disableBillingFields() {
-            $('#vatNr,#vatCountryCode,#billing-address[data-invoice-enabled]').attr('required', false).attr('disabled', '');
+            $('#vatNr,#vatCountryCode').attr('required', false).attr('disabled', '');
         }
 
         disableBillingFields();