diff --git a/app/components/public/add-to-calender.hbs b/app/components/public/add-to-calender.hbs
index e80a441406b..7ad8cacbe3f 100644
--- a/app/components/public/add-to-calender.hbs
+++ b/app/components/public/add-to-calender.hbs
@@ -3,9 +3,9 @@
     <i class="clock alternate outline icon pt-1"></i>
     <div class="content">
       {{#if this.isSingleDay}}
-        {{general-date @event.startsAt @event.timezone "dddd, D MMMM, YYYY"}}<br>{{general-date @event.startsAt @event.timezone "h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "h:mm A"}} 
+        {{general-date @event.startsAt "dddd, D MMMM, YYYY" tz=@event.timezone}}<br>{{general-date @event.startsAt "h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "h:mm A" tz=@event.timezone}} 
       {{else}}
-        {{general-date @event.startsAt @event.timezone "dddd, D MMMM, YYYY h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "dddd, D MMMM, YYYY h:mm A"}} 
+        {{general-date @event.startsAt "dddd, D MMMM, YYYY h:mm A" tz=@event.timezone}} {{t 'to'}} {{general-date @event.endsAt "dddd, D MMMM, YYYY h:mm A" tz=@event.timezone}} 
       {{/if}}
       ({{this.timezone}})
       <br>
diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs
index 742b2062fec..c137cb5268d 100644
--- a/app/components/public/session-item.hbs
+++ b/app/components/public/session-item.hbs
@@ -27,7 +27,7 @@
         <div class="left floated twelve wide column">
           {{#if @session.startsAt}}
             <div class=""><i class="icon map marker alternate"></i>{{@session.microlocation.name}}</div>
-            <div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt @timezone}} - {{general-date @session.endsAt @timezone}}</div>
+            <div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt tz=@timezone}} - {{general-date @session.endsAt tz=@timezone}}</div>
           {{/if}}
         </div>
       {{else}}
@@ -49,7 +49,7 @@
         <div class="right floated four wide column">
           {{#if @session.startsAt}}
             <div class=""><i class="icon map marker alternate"></i>{{@session.microlocation.name}}</div>
-            <div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt @timezone 'D MMM, YYYY h:mm A (z)'}}</div>
+            <div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt 'D MMM, YYYY h:mm A (z)' tz=@timezone}}</div>
           {{/if}}
         </div>
       {{/if}}
diff --git a/app/components/ui-table/cell/cell-date.hbs b/app/components/ui-table/cell/cell-date.hbs
index a70d6aef47d..612c7520c3c 100644
--- a/app/components/ui-table/cell/cell-date.hbs
+++ b/app/components/ui-table/cell/cell-date.hbs
@@ -1 +1 @@
-{{general-date @record @props.options.timezone @props.options.dateFormat}}
+{{general-date @record @props.options.dateFormat tz=@props.options.timezone}}
diff --git a/app/helpers/general-date.js b/app/helpers/general-date.js
index 368d11a5bee..04637f6619d 100644
--- a/app/helpers/general-date.js
+++ b/app/helpers/general-date.js
@@ -3,12 +3,12 @@ import moment from 'moment';
 
 const locales12Hours = new Set(['en', 'bn', 'hi', 'id', 'ja', 'run', 'th', 'vi', 'ko']);
 
-export function generalDate(params) {
-  const timezone = params[1] || moment.tz.guess();
+export function generalDate(params, { tz }) {
+  const timezone = tz || moment.tz.guess();
 
   const local = moment(params[0]).tz(timezone).locale();
 
-  let format = params[2] || 'h:mm A, MMMM Do YYYY (z)';
+  let format = params[1] || 'h:mm A, MMMM Do YYYY (z)';
 
   if (!locales12Hours.has(local)) {
     format = format.replaceAll('h', 'H');
diff --git a/app/templates/admin/sales/revenue.hbs b/app/templates/admin/sales/revenue.hbs
index 08f2e412d48..ccc5e391828 100644
--- a/app/templates/admin/sales/revenue.hbs
+++ b/app/templates/admin/sales/revenue.hbs
@@ -38,7 +38,7 @@
                 {{order.name}}
               </td>
               <td>
-                {{general-date order.eventDate '' 'D MMM, YYYY'}} 
+                {{general-date order.eventDate 'D MMM, YYYY'}} 
               </td>
               <td class="right aligned">
                 {{order.ticketCount}}
diff --git a/app/templates/components/event-card.hbs b/app/templates/components/event-card.hbs
index 47d29dd10d5..6f41bb33ab9 100644
--- a/app/templates/components/event-card.hbs
+++ b/app/templates/components/event-card.hbs
@@ -23,7 +23,7 @@
       </SmartOverflow>
       <div class="meta">
         <span class="date">
-          {{general-date this.event.startsAt this.event.timezone}}
+          {{general-date this.event.startsAt tz=this.event.timezone}}
         </span>
       </div>
       <SmartOverflow @class="description">
diff --git a/app/templates/components/event-invoice/event-info.hbs b/app/templates/components/event-invoice/event-info.hbs
index 0e8854f3f43..1b1b0281404 100644
--- a/app/templates/components/event-invoice/event-info.hbs
+++ b/app/templates/components/event-invoice/event-info.hbs
@@ -12,9 +12,9 @@
   <div class="ui padded segment">
     <strong>{{t 'At'}} {{this.event.locationName}}</strong>
     <br>
-    <strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'From'}}:</strong> {{general-date this.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
     <br>
-    <strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'To'}}:</strong> {{general-date this.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
     {{#if this.event.ownerName}}
       <br>
       <strong>{{t 'Organized By'}}:</strong> {{this.event.ownerName}}
diff --git a/app/templates/components/event-invoice/invoice-summary.hbs b/app/templates/components/event-invoice/invoice-summary.hbs
index 416225341d0..3e7c7cb7dcb 100644
--- a/app/templates/components/event-invoice/invoice-summary.hbs
+++ b/app/templates/components/event-invoice/invoice-summary.hbs
@@ -26,8 +26,8 @@
     <tbody>
       <tr>
         <td>{{this.event.name}}</td>
-        <td>{{general-date this.data.issuedAt '' 'D MMM, YYYY'}}</td>
-        <td>{{general-date this.data.completedAt '' 'D MMM, YYYY'}}</td>
+        <td>{{general-date this.data.issuedAt 'D MMM, YYYY'}}</td>
+        <td>{{general-date this.data.completedAt 'D MMM, YYYY'}}</td>
         <td>{{currency-symbol this.eventCurrency}} {{format-money this.data.amount}}</td>
       </tr>
     </tbody>
diff --git a/app/templates/components/events/view/overview/general-info.hbs b/app/templates/components/events/view/overview/general-info.hbs
index 6f795a5c76e..2209f4edc29 100644
--- a/app/templates/components/events/view/overview/general-info.hbs
+++ b/app/templates/components/events/view/overview/general-info.hbs
@@ -25,11 +25,11 @@
       </tr>
       <tr>
         <td><strong>{{t 'Start time'}}</strong></td>
-        <td>{{general-date this.data.event.startsAt this.data.event.timezone}}</td>
+        <td>{{general-date this.data.event.startsAt tz=this.data.event.timezone}}</td>
       </tr>
       <tr>
         <td><strong>{{t 'End time'}}</strong></td>
-        <td>{{general-date this.data.event.endsAt this.data.event.timezone}}</td>
+        <td>{{general-date this.data.event.endsAt tz=this.data.event.timezone}}</td>
       </tr>
       <tr>
         <td><strong>{{t 'Session types'}}</strong></td>
diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs
index fb9f45b5f36..7d7ab508cd2 100644
--- a/app/templates/components/footer-main.hbs
+++ b/app/templates/components/footer-main.hbs
@@ -105,7 +105,7 @@
     <div class="ui stackable grid">
       <div class="thirteen wide computer twelve wide tablet column left aligned">
         <div class="ui horizontal inverted small divided link list no top margin">
-          <span class="item">{{t 'Copyright'}} &copy; {{general-date (now) '' 'YYYY'}}  {{this.settings.appName}} </span>
+          <span class="item">{{t 'Copyright'}} &copy; {{general-date (now) 'YYYY'}}  {{this.settings.appName}} </span>
           <span class="hidden-item">
             {{!-- Possible Page Values --}}
             {{t 'Terms'}}
diff --git a/app/templates/components/order-card.hbs b/app/templates/components/order-card.hbs
index 1d56fb6c5b3..6a8e3afa033 100644
--- a/app/templates/components/order-card.hbs
+++ b/app/templates/components/order-card.hbs
@@ -27,7 +27,7 @@
       </SmartOverflow>
       <div class="meta">
         <span class="date">
-          {{general-date this.order.event.startsAt this.order.event.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}
+          {{general-date this.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.order.event.timezone}}
         </span>
       </div>
       <SmartOverflow @class="description">
@@ -46,7 +46,7 @@
         </span>
         <span>#{{this.order.identifier}}</span>
         {{#if this.order.completedAt}}
-          <span>{{t 'on'}} {{general-date this.order.completedAt '' 'D MMM, YYYY h:mm A'}}</span>
+          <span>{{t 'on'}} {{general-date this.order.completedAt 'D MMM, YYYY h:mm A'}}</span>
         {{/if}}
       </span>
     </div>
diff --git a/app/templates/components/orders/event-info.hbs b/app/templates/components/orders/event-info.hbs
index 872f1404804..51d99aa933f 100644
--- a/app/templates/components/orders/event-info.hbs
+++ b/app/templates/components/orders/event-info.hbs
@@ -24,9 +24,9 @@
       <strong>{{t 'Location or online event details to be announced'}}</strong>
     {{/if}}
     <br>
-    <strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'From'}}:</strong> {{general-date this.data.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
     <br>
-    <strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+    <strong>{{t 'To'}}:</strong> {{general-date this.data.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
     {{#if this.data.event.ownerName}}
       <br>
       <strong>{{t 'Organized By'}}:</strong> {{this.data.event.ownerName}}
diff --git a/app/templates/components/public/call-for-speakers.hbs b/app/templates/components/public/call-for-speakers.hbs
index 82c09a69ca3..75e5c5d7d7c 100644
--- a/app/templates/components/public/call-for-speakers.hbs
+++ b/app/templates/components/public/call-for-speakers.hbs
@@ -4,15 +4,15 @@
   {{#if this.data.speakersCall.isOpen}}
     <a href="#" class="ui basic green label">{{t 'Open'}}</a>
     <div class="sub header">
-      {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt this.data.speakersCall.event.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}
+      {{t 'Call for Speakers is open until'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}}
     </div>
   {{else}}
     <a href="#" class="ui basic red label">{{t 'Closed'}}</a>
     <div class="sub header">
       {{#if this.data.speakersCall.isInFuture}}
-        {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt this.data.speakersCall.event.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}
+        {{t 'Call for Speakers will open at'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}}
       {{else}}
-        {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt this.data.speakersCall.event.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}
+        {{t 'Call for Speakers was closed at'}} {{general-date this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.data.speakersCall.event.timezone}}
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/templates/components/public/speaker-item.hbs b/app/templates/components/public/speaker-item.hbs
index 07296769c6f..5d2724b21f5 100644
--- a/app/templates/components/public/speaker-item.hbs
+++ b/app/templates/components/public/speaker-item.hbs
@@ -48,7 +48,7 @@
           {{#if session.startsAt}}
             <p>
               <strong>
-                {{general-date session.startsAt @timezone}}
+                {{general-date session.startsAt tz=@timezone}}
               </strong>
             </p>
           {{/if}}
@@ -56,7 +56,7 @@
             <div class="ui fluid rounded-default p-4" style={{css color=(text-color session.track.color) background-color=session.track.color}}>
               <div style={{css opacity=0.9}}>
                 {{#if (and session.startsAt session.endsAt)}}
-                  <strong>{{general-date session.startsAt @timezone 'HH:mm'}} - {{general-date session.endsAt @timezone 'hh:mm'}}</strong>
+                  <strong>{{general-date session.startsAt 'HH:mm' tz=@timezone}} - {{general-date session.endsAt 'hh:mm' tz=@timezone}}</strong>
                 {{/if}}
                 <h3 class="m-0" style={{css user-select='text'}}>
                   {{session.title}}
diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs
index 589eed54c06..b982811057b 100644
--- a/app/templates/components/public/ticket-list.hbs
+++ b/app/templates/components/public/ticket-list.hbs
@@ -28,7 +28,7 @@
                 <small class="ui gray-text tiny">{{ticket.description}}</small>
               {{/if}}
               <div>
-                <small class="ui gray-text small">Sale ends on {{general-date ticket.salesEndsAt @event.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}</small>
+                <small class="ui gray-text small">Sale ends on {{general-date ticket.salesEndsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=@event.timezone}}</small>
               </div>
             </td>
             <td></td>
diff --git a/app/templates/components/public/track-item.hbs b/app/templates/components/public/track-item.hbs
index bb10c81f0e7..c2b12c75c59 100644
--- a/app/templates/components/public/track-item.hbs
+++ b/app/templates/components/public/track-item.hbs
@@ -79,7 +79,7 @@
       </div>
     {{/each}}
     <div class=""><i class="icon map marker alternate"></i>{{this.session.microlocation.name}}</div>
-    {{general-date this.session.startsAt this.session.event.timezone}} - {{general-date this.session.endsAt this.session.event.timezone}}<br/>
+    {{general-date this.session.startsAt tz=this.session.event.timezone}} - {{general-date this.session.endsAt tz=this.session.event.timezone}}<br/>
     {{this.session.track.name}}
   </div>
 </UiAccordion>
diff --git a/app/templates/components/session-card.hbs b/app/templates/components/session-card.hbs
index d2b273ad2ef..8494bdae418 100644
--- a/app/templates/components/session-card.hbs
+++ b/app/templates/components/session-card.hbs
@@ -20,7 +20,7 @@
       <div class="meta">
         <span class="time">
           {{#if this.session.startsAt}}
-            {{general-date this.session.startsAt '' 'D MMM, YYYY h:mm A'}}
+            {{general-date this.session.startsAt 'D MMM, YYYY h:mm A'}}
           {{else}}
             {{t 'Session Not Yet Scheduled'}}
           {{/if}}
diff --git a/app/templates/components/ui-table/cell/cell-event-date.hbs b/app/templates/components/ui-table/cell/cell-event-date.hbs
index d4008955a1e..c61779a3115 100644
--- a/app/templates/components/ui-table/cell/cell-event-date.hbs
+++ b/app/templates/components/ui-table/cell/cell-event-date.hbs
@@ -1,11 +1,11 @@
 {{#if this.record}}
   {{#if this.extraRecords.endsAt}}
     <div>
-      {{general-date this.record this.extraRecords.timezone "D MMM, YYYY h:mm A (z)"}}
+      {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}}
     </div>
     (to)
     <div>
-      {{general-date this.record this.extraRecords.timezone "D MMM, YYYY h:mm A (z)"}}
+      {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}}
     </div>
   {{else}}
     <span>
diff --git a/app/templates/components/ui-table/cell/cell-simple-date.hbs b/app/templates/components/ui-table/cell/cell-simple-date.hbs
index 2c76574b5f3..e4a3e944ca4 100644
--- a/app/templates/components/ui-table/cell/cell-simple-date.hbs
+++ b/app/templates/components/ui-table/cell/cell-simple-date.hbs
@@ -1,9 +1,9 @@
 {{#if this.extraRecords.timezone}}
   <span>
-    {{general-date this.record this.extraRecords.timezone "D MMM, YYYY h:mm A (z)"}}
+    {{general-date this.record "D MMM, YYYY h:mm A (z)" tz=this.extraRecords.timezone}}
   </span>
 {{else if this.record}}
   <span>
-    {{general-date this.record '' (if this.props.options.dateFormat this.props.options.dateFormat "D MMM, YYYY h:mm A")}}
+    {{general-date this.record (if this.props.options.dateFormat this.props.options.dateFormat "D MMM, YYYY h:mm A")}}
   </span>
 {{/if}}
diff --git a/app/templates/components/ui-table/cell/cell-validity.hbs b/app/templates/components/ui-table/cell/cell-validity.hbs
index fdba41f392f..3aeb33e79a3 100644
--- a/app/templates/components/ui-table/cell/cell-validity.hbs
+++ b/app/templates/components/ui-table/cell/cell-validity.hbs
@@ -1,5 +1,5 @@
 <span>
-  {{general-date this.record '' 'D MMM, YYYY h:mm A'}}
+  {{general-date this.record 'D MMM, YYYY h:mm A'}}
   <br>To<br>
-  {{general-date this.extraRecords.validTill '' 'D MMM, YYYY h:mm A'}}
+  {{general-date this.extraRecords.validTill 'D MMM, YYYY h:mm A'}}
 </span>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
index 5fcbc35b480..c68787e03ad 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
@@ -1,5 +1,5 @@
 {{#if (eq @record.status 'completed')}}
-  {{general-date @record.completedAt '' "D MMM, YYYY h:mm A"}}
+  {{general-date @record.completedAt "D MMM, YYYY h:mm A"}}
 {{else}}
-  {{general-date @record.createdAt '' "D MMM, YYYY h:mm A"}}
+  {{general-date @record.createdAt "D MMM, YYYY h:mm A"}}
 {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
index 9788f713dd6..b972e59575a 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
@@ -10,10 +10,10 @@
       </span>
     {{/if}}
     {{#if (eq this.record.status 'completed')}}
-      {{general-date this.record.completedAt '' 'D MMM, YYYY h:mm A'}}
+      {{general-date this.record.completedAt 'D MMM, YYYY h:mm A'}}
       {{moment-from-now this.record.completedAt}}
     {{else}}
-      {{general-date this.record.createdAt '' 'D MMM, YYYY h:mm A'}}
+      {{general-date this.record.createdAt 'D MMM, YYYY h:mm A'}}
       {{moment-from-now this.record.createdAt}}
     {{/if}}
   </div>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs
index acf3f429f38..6fde70bd393 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-validity.hbs
@@ -1,3 +1,3 @@
 <span>
-	{{general-date this.record '' 'D MMM, YYYY h:mm A'}}
+	{{general-date this.record 'D MMM, YYYY h:mm A'}}
 </span>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs
index 9c85c9eb608..e3b6b7bf56e 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-date.hbs
@@ -1,9 +1,9 @@
 {{#if this.record}}
   <div>
-    {{general-date this.record '' 'D MMM, YYYY h:mm A'}}
+    {{general-date this.record 'D MMM, YYYY h:mm A'}}
   </div>
 {{else}}
   <div>
-    {{general-date this.extraRecords.createdAt '' 'D MMM, YYYY h:mm A'}}
+    {{general-date this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}}
   </div>
 {{/if}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
index c2f4ddabee8..9a06c532675 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
@@ -13,9 +13,9 @@
     {{/if}}
     <span class="muted text">
       {{#if this.extraRecords.completedAt}}
-        {{general-date this.extraRecords.completedAt '' 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}}
+        {{general-date this.extraRecords.completedAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}}
       {{else}}
-        {{general-date this.extraRecords.createdAt '' 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}}
+        {{general-date this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}}
       {{/if}}
     </span>
   </div>
diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs
index f5cbad5420e..881953be818 100644
--- a/app/templates/explore.hbs
+++ b/app/templates/explore.hbs
@@ -25,13 +25,13 @@
       {{/if}}
       {{#if this.filters.start_date}}
         <div class="ui mini label">
-          {{general-date this.filters.start_date '' 'D MMM, YYYY'}}
+          {{general-date this.filters.start_date 'D MMM, YYYY'}}
           <a href="#" role="button" {{action 'clearFilter' 'start_date'}}><i class="icon close"></i></a>
         </div>
       {{/if}}
       {{#if this.filters.end_date}}
         <div class="ui mini label">
-          {{general-date this.filters.end_date '' 'D MMM, YYYY'}}
+          {{general-date this.filters.end_date 'D MMM, YYYY'}}
           <a href="#" role="button" {{action 'clearFilter' 'end_date'}}><i class="icon close"></i></a>
         </div>
       {{/if}}
diff --git a/app/templates/orders/expired.hbs b/app/templates/orders/expired.hbs
index cbd6bd4fd97..173f6864c89 100644
--- a/app/templates/orders/expired.hbs
+++ b/app/templates/orders/expired.hbs
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="column">
       <div class="ui small gray-text">
-        {{general-date this.model.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+        {{general-date this.model.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
         <br>
         {{this.model.event.locationName}}
       </div>
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs
index 58c640a859d..420cd9f21a8 100644
--- a/app/templates/orders/new.hbs
+++ b/app/templates/orders/new.hbs
@@ -8,7 +8,7 @@
     <div class="row">
       <div class="column">
         <div class="ui small gray-text">
-          {{general-date this.model.order.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+          {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
           <br>
           {{this.model.order.event.locationName}}
         </div>
diff --git a/app/templates/orders/pending.hbs b/app/templates/orders/pending.hbs
index 7708eb128c4..25998f5cb7d 100644
--- a/app/templates/orders/pending.hbs
+++ b/app/templates/orders/pending.hbs
@@ -8,7 +8,7 @@
     <div class="row">
       <div class="column">
         <div class="ui small gray-text">
-          {{general-date this.model.order.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+          {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
           <br>
           {{this.model.order.event.locationName}}
         </div>
diff --git a/app/templates/orders/view.hbs b/app/templates/orders/view.hbs
index c0e4fd448bc..3932bceedca 100644
--- a/app/templates/orders/view.hbs
+++ b/app/templates/orders/view.hbs
@@ -7,7 +7,7 @@
   <div class="row print">
     <div class="column">
       <div class="ui small gray-text">
-        {{general-date this.model.order.event.startsAt '' 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt '' 'dddd, D MMMM, YYYY h:mm A'}}
+        {{general-date this.model.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}} - {{general-date this.model.order.event.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
         <br>
         {{this.model.order.event.locationName}}
       </div>
diff --git a/app/templates/public.hbs b/app/templates/public.hbs
index 6cc2734df3d..de27ac390af 100644
--- a/app/templates/public.hbs
+++ b/app/templates/public.hbs
@@ -9,9 +9,9 @@
             <img src="{{this.model.logoUrl}}" class="logo mr-8" />
           {{/if}}
           <div>
-            <h4 class="event time">{{general-date this.model.startsAt this.model.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}</h4>
+            <h4 class="event time">{{general-date this.model.startsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.model.timezone}}</h4>
             {{#if this.displayEndDate}}
-              <h5 class="event time ends">{{t 'To'}} {{general-date this.model.endsAt this.model.timezone 'dddd, D MMMM, YYYY h:mm A (z)'}}</h5>
+              <h5 class="event time ends">{{t 'To'}} {{general-date this.model.endsAt 'dddd, D MMMM, YYYY h:mm A (z)' tz=this.model.timezone}}</h5>
             {{/if}}
             <h1 class="event name">{{this.model.name}}</h1>
             <h4 class="event location"><i class="icon map marker alternate"></i>{{this.headerLocation}}</h4>
diff --git a/app/templates/public/sessions.hbs b/app/templates/public/sessions.hbs
index 9b9f6d84daa..a3f982a148c 100644
--- a/app/templates/public/sessions.hbs
+++ b/app/templates/public/sessions.hbs
@@ -3,7 +3,7 @@
 <div class="d-flex wrap">
   <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=null}} class="ui button mb-2">{{t 'All'}}</LinkTo>
   {{#each this.allDates as |date|}}
-    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{general-date date '' 'D MMM, YYYY'}}</LinkTo>
+    <LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{general-date date 'D MMM, YYYY'}}</LinkTo>
   {{/each}}
 
   <Widgets::TimeZonePicker
@@ -27,8 +27,8 @@
   {{#each this.model.session as |session|}}
     <div class="ui grid">
       <div class="three wide column">
-        {{general-date session.startsAt session.event.timezone 'hh:mm a'}} - 
-        {{general-date session.endsAt session.event.timezone 'hh:mm a'}}
+        {{general-date session.startsAt 'hh:mm a' tz=session.event.timezone}} - 
+        {{general-date session.endsAt 'hh:mm a' tz=session.event.timezone}}
       </div>
       <div class="thirteen wide column">
         <Public::TrackItem @session={{session}} />
@@ -59,7 +59,7 @@
           <tr>
             <td class="top aligned {{unless this.device.isMobile 'centered text'}}" style="border-top: none;">
               <h4 class="ui header {{unless this.device.isMobile 'pt-4'}}" style="color: rgba(0, 0, 0, 0.7);">
-                {{general-date session.startsAt this.timezone 'h:mm A (z)'}}
+                {{general-date session.startsAt 'h:mm A (z)' tz=this.timezone}}
               </h4>
             </td>
             <td style="border-top: none; border-left: 1px solid lightgrey">
diff --git a/tests/integration/helpers/general-date-test.js b/tests/integration/helpers/general-date-test.js
index 3753064b465..e8f1a576b4e 100644
--- a/tests/integration/helpers/general-date-test.js
+++ b/tests/integration/helpers/general-date-test.js
@@ -10,7 +10,7 @@ module('Integration | Helper | general date', function(hooks) {
   test('it renders', async function(assert) {
     this.set('inputMomentValue', moment('2019-05-01T03:30:00+09:00'));
     this.set('inputTimezoneValue', 'Japan');
-    await render(hbs`{{general-date inputMomentValue inputTimezoneValue}}`);
+    await render(hbs`{{general-date inputMomentValue tz=inputTimezoneValue}}`);
     assert.equal(this.element.innerHTML.trim(), '3:30 AM, May 1st 2019 (JST)');
   });
 });