diff --git a/app/models/order.js b/app/models/order.js
index 610ab3cea9f..6e467e2e5a4 100644
--- a/app/models/order.js
+++ b/app/models/order.js
@@ -1,4 +1,5 @@
 import attr from 'ember-data/attr';
+import { computed } from '@ember/object';
 import ModelBase from 'open-event-frontend/models/base';
 import { belongsTo, hasMany } from 'ember-data/relationships';
 import CustomPrimaryKeyMixin from 'open-event-frontend/mixins/custom-primary-key';
@@ -37,5 +38,15 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
   discountCode     : belongsTo('discount-code'),
   accessCode       : belongsTo('access-code'),
   tickets          : hasMany('ticket', { readOnly: true }),
-  attendees        : hasMany('attendee')
+  attendees        : hasMany('attendee'),
+
+  includedTaxAmount: computed('amount', 'event.isTaxEnabled', 'event.tax.rate', function() {
+    const isTaxEnabled = this.event.get('tax.isTaxEnabled');
+    const taxRate = this.event.get('tax.rate');
+    if (isTaxEnabled) {
+      return ((taxRate * this.amount) / (100 + taxRate)).toFixed(2);
+    } else {
+      return 0;
+    }
+  })
 });
diff --git a/app/templates/components/orders/order-summary.hbs b/app/templates/components/orders/order-summary.hbs
index ca1b8ed1e97..82583d666d1 100644
--- a/app/templates/components/orders/order-summary.hbs
+++ b/app/templates/components/orders/order-summary.hbs
@@ -162,7 +162,7 @@
                           <small class="ui gray-text small">{{t 'Included in Total' }}</small>
                         {{/if}}
                       </td>
-                      <td><CurrencyAmount @currency={{this.eventCurrency}} @amount={{sub this.data.amount this.total}}/></td>
+                      <td><CurrencyAmount @currency={{this.eventCurrency}} @amount={{this.data.includedTaxAmount}}/></td>
                     </tr>
                   {{/if}}
                   <tr><td>{{t 'Grand Total'}}</td>