diff --git a/app/controllers/orders/view.js b/app/controllers/orders/view.js
index 7f44cf0b35e..032d2dcbeb0 100644
--- a/app/controllers/orders/view.js
+++ b/app/controllers/orders/view.js
@@ -1,5 +1,5 @@
 import classic from 'ember-classic-decorator';
-import { action } from '@ember/object';
+import { action, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
@@ -11,6 +11,11 @@ export default class ViewController extends Controller {
   @service
   printThis;
 
+  @computed('model.order.user', 'authManager.currentUser')
+  get showTicketsButton() {
+    return this.model.order.get('user.id') === this.authManager.currentUser.id || this.authManager.currentUser.isAdmin;
+  }
+
   @action
   downloadInvoice(eventName, orderId) {
     this.set('isLoading', true);
diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js
index 77dde1af4fb..9e3de3e5c9b 100644
--- a/app/routes/events/view/tickets/orders/list.js
+++ b/app/routes/events/view/tickets/orders/list.js
@@ -40,7 +40,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
     }
 
     let queryString = {
-      include        : 'tickets,user',
+      include        : 'tickets,user,attendees',
       filter         : filterOptions,
       'page[size]'   : params.per_page || 10,
       'page[number]' : params.page || 1
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs
index a8131b37a83..99d5cae2812 100644
--- a/app/templates/orders/view.hbs
+++ b/app/templates/orders/view.hbs
@@ -30,7 +30,7 @@
       <Orders::EventInfo
         @data={{this.model.order}} />
       <br/>
-      {{#if (eq this.model.order.user.id  this.authManager.currentUser.id)}}
+      {{#if this.showTicketsButton}}
         <div class="d-flex">
           <button class="ui labeled icon flex-1 {{if this.isLoadingTickets 'loading'}} {{if this.device.isMobile 'fluid'}} button"
           {{action this.downloadTickets this.model.event.name this.model.order.identifier}}>