diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js
index dd5d4155d4e..28faa84c4df 100644
--- a/app/controllers/events/view/sessions/list.js
+++ b/app/controllers/events/view/sessions/list.js
@@ -96,8 +96,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         extraValuePaths : ['isLocked'],
         cellComponent   : 'ui-table/cell/events/view/sessions/cell-lock-session',
         actions         : {
-          unlockSession : this.unlockSession.bind(this),
-          lockSession   : this.lockSession.bind(this)
+          lockSession: this.lockSession.bind(this)
         }
       }
     ];
@@ -137,51 +136,29 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
   }
 
   @action
-  lockSession(session_id) {
-    let session =  this.store.peekRecord('session', session_id, { backgroundReload: false });
-    session.set('isLocked', true);
-    this.set('isLoading', true);
-    session.save()
-      .then(() => {
-        this.notify.success(this.l10n.t('Session has been locked successfully.'),
-          {
-            id: 'session_locked'
-          });
-        this.refreshModel.bind(this)();
-      })
-      .catch(() => {
-        this.notify.error(this.l10n.t('An unexpected error has occurred.'),
-          {
-            id: 'session_lock_error'
-          });
-      })
-      .finally(() => {
-        this.set('isLoading', false);
-      });
-  }
-
-  @action
-  unlockSession(session_id) {
-    let session =  this.store.peekRecord('session', session_id, { backgroundReload: false });
-    session.set('isLocked', false);
+  async lockSession(session_id, lock) {
+    const session =  this.store.peekRecord('session', session_id, { backgroundReload: false });
+    const { isLocked } = session;
+    session.set('isLocked', lock);
     this.set('isLoading', true);
-    session.save()
-      .then(() => {
-        this.notify.success(this.l10n.t('Session has been unlocked successfully.'),
-          {
-            id: 'session_unlock'
-          });
-        this.refreshModel.bind(this)();
-      })
-      .catch(() => {
-        this.notify.error(this.l10n.t('An unexpected error has occurred.'),
-          {
-            id: 'session_unexpected_unlock'
-          });
-      })
-      .finally(() => {
-        this.set('isLoading', false);
-      });
+    const lockMessage = lock ? 'locked' : 'unlocked';
+    try {
+      await session.save();
+      this.notify.success(this.l10n.t(`Session has been ${ lockMessage } successfully.`),
+        {
+          id: 'session_lock'
+        });
+      this.refreshModel.bind(this)();
+    } catch (e) {
+      session.set('isLocked', isLocked);
+      console.error('Error while changing session lock in organizer session list', e);
+      this.notify.error(this.l10n.t('An unexpected error has occurred.'),
+        {
+          id: 'session_unexpected_lock'
+        });
+    } finally {
+      this.set('isLoading', false);
+    }
   }
 
   @action
diff --git a/app/templates/components/ui-table/cell/events/view/sessions/cell-lock-session.hbs b/app/templates/components/ui-table/cell/events/view/sessions/cell-lock-session.hbs
index d536d561aa2..86b59c045bb 100644
--- a/app/templates/components/ui-table/cell/events/view/sessions/cell-lock-session.hbs
+++ b/app/templates/components/ui-table/cell/events/view/sessions/cell-lock-session.hbs
@@ -1,9 +1,9 @@
 {{#if this.extraRecords.isLocked}}
-  <UiPopup @content={{t "Unlock Session"}} @class="ui basic button" @click={{action this.props.actions.unlockSession this.record}} @position="left center">
+  <UiPopup @content={{t "Unlock Session"}} @class="ui basic button" @click={{action this.props.actions.lockSession this.record false}} @position="left center">
     <i class="lock icon"></i>		
   </UiPopup>
 {{else}}
-  <UiPopup @content={{t "Lock Session"}} @class="ui basic button" @click={{action this.props.actions.lockSession this.record}} @position="left center">
+  <UiPopup @content={{t "Lock Session"}} @class="ui basic button" @click={{action this.props.actions.lockSession this.record true}} @position="left center">
     <i class="unlock icon"></i>		
   </UiPopup>
 {{/if}}
\ No newline at end of file