diff --git a/app/components/forms/orders/attendee-list.js b/app/components/forms/orders/attendee-list.js
index 8e9cbf97f9a..74abe7e1db8 100644
--- a/app/components/forms/orders/attendee-list.js
+++ b/app/components/forms/orders/attendee-list.js
@@ -14,7 +14,7 @@ export default class extends Component {
     return this.data.attendees;
   }
 
-  @or('data.amount', 'data.isBillingEnabled')
+  @or('event.isBillingInfoMandatory', 'data.isBillingEnabled')
   showBillingInfo;
 
   @computed('fields.@each.form')
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs
index 713b056f1bf..b29ef0ce693 100644
--- a/app/templates/orders/view.hbs
+++ b/app/templates/orders/view.hbs
@@ -37,7 +37,7 @@
   </div>
   <div class="row">
     <div class="ten wide column">
-      {{forms/orders/attendee-list save='save' data=model.order fields=model.form}}
+      {{forms/orders/attendee-list save='save' data=model.order fields=model.form event=model.event}}
     </div>
     <div class="six wide column">
       <div class="row">