diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js
index ca80a694b..aa1ee7eda 100644
--- a/client/components/boards/boardArchive.js
+++ b/client/components/boards/boardArchive.js
@@ -25,8 +25,8 @@ BlazeComponent.extendComponent({
             Meteor.settings &&
             Meteor.settings.public &&
             Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          if (isSandstorm && Utils.getCurrentBoardId()) {
+            const currentBoard = Utils.getCurrentBoard();
             currentBoard.archive();
           }
           const board = this.currentData();
@@ -39,8 +39,8 @@ BlazeComponent.extendComponent({
             Meteor.settings &&
             Meteor.settings.public &&
             Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          if (isSandstorm && Utils.getCurrentBoardId()) {
+            const currentBoard = Utils.getCurrentBoard();
             Boards.remove(currentBoard._id);
           }
           Boards.remove(this._id);
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 2ed40bbe7..658c5e235 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -43,7 +43,7 @@ BlazeComponent.extendComponent({
     this.mouseHasEnterCardDetails = false;
 
     // fix swimlanes sort field if there are null values
-    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const currentBoardData = Utils.getCurrentBoard();
     const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
     if (nullSortSwimlanes.count() > 0) {
       const swimlanes = currentBoardData.swimlanes();
@@ -214,7 +214,7 @@ BlazeComponent.extendComponent({
 
     // If there is no data in the board (ie, no lists) we autofocus the list
     // creation form by clicking on the corresponding element.
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     if (Utils.canModifyBoard() && currentBoard.lists().count() === 0) {
       boardComponent.openNewListForm();
     }
@@ -222,7 +222,7 @@ BlazeComponent.extendComponent({
 
   notDisplayThisBoard() {
     let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
-    let currentBoard = Boards.findOne(Session.get('currentBoard'));
+    let currentBoard = Utils.getCurrentBoard();
     if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue && currentBoard.permission == 'public') {
       return true;
     }
@@ -342,7 +342,7 @@ BlazeComponent.extendComponent({
       },
       locale: TAPi18n.getLanguage(),
       events(start, end, timezone, callback) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
         const events = [];
         const pushEvent = function (card, title, start, end, extraCls) {
           start = start || card.startAt;
@@ -416,7 +416,7 @@ BlazeComponent.extendComponent({
         }
       },
       select: function(startDate) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
         const currentUser = Meteor.user();
         const $modal = $(`
           <div class="modal fade" tabindex="-1" role="dialog">
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index a2141f37f..2695256ae 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -18,14 +18,14 @@ Template.boardMenuPopup.events({
   'click .js-change-board-color': Popup.open('boardChangeColor'),
   'click .js-change-language': Popup.open('changeLanguage'),
   'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     currentBoard.archive();
     // XXX We should have some kind of notification on top of the page to
     // confirm that the board was successfully archived.
     FlowRouter.go('home');
   }),
   'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     Popup.back();
     Boards.remove(currentBoard._id);
     FlowRouter.go('home');
@@ -58,7 +58,7 @@ Template.boardChangeTitlePopup.events({
 
 BlazeComponent.extendComponent({
   watchLevel() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
   },
 
@@ -70,7 +70,7 @@ BlazeComponent.extendComponent({
 
   // Only show the star counter if the number of star is greater than 2
   showStarCounter() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard && currentBoard.stars >= 2;
   },
   /*
@@ -315,12 +315,12 @@ BlazeComponent.extendComponent({
     return !TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly').booleanValue;
   },
   visibilityCheck() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return this.currentData() === currentBoard.permission;
   },
 
   selectBoardVisibility() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     const visibility = this.currentData();
     currentBoard.setVisibility(visibility);
     Popup.back();
@@ -337,7 +337,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   watchLevel() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard.getWatchLevel(Meteor.userId());
   },
 
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index 92861900b..f43875df2 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -326,7 +326,7 @@ BlazeComponent.extendComponent({
     return ret;
   },
   isBackgroundImage() {
-    //const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    //const currentBoard = Utils.getCurrentBoard();
     //return currentBoard.backgroundImageURL === $(".attachment-thumbnail-img").attr("src");
     return false;
   },
@@ -342,14 +342,14 @@ BlazeComponent.extendComponent({
           Popup.back();
         },
         'click .js-add-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           currentBoard.setBackgroundImageURL(attachmentActionsLink);
           Utils.setBackgroundImage(attachmentActionsLink);
           Popup.back();
           event.preventDefault();
         },
         'click .js-remove-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           currentBoard.setBackgroundImageURL("");
           Utils.setBackgroundImage("");
           Popup.back();
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 541539d0d..e16e915df 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -727,7 +727,7 @@ BlazeComponent.extendComponent({
 }).register('editCardTitleForm');
 
 Template.cardMembersPopup.onCreated(function () {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
   let members = currBoard.activeMembers();
 
   // let query = {
@@ -757,7 +757,7 @@ Template.cardMembersPopup.helpers({
 });
 
 const filterMembers = (filterTerm) => {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
   let members = currBoard.activeMembers();
 
   // let query = {
@@ -1597,7 +1597,7 @@ EscapeActions.register(
 );
 
 Template.cardAssigneesPopup.onCreated(function () {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
   let members = currBoard.activeMembers();
 
   // let query = {
diff --git a/client/components/cards/labels.js b/client/components/cards/labels.js
index 875636376..6b276efc4 100644
--- a/client/components/cards/labels.js
+++ b/client/components/cards/labels.js
@@ -32,7 +32,7 @@ Template.createLabelPopup.helpers({
   // is not already used in the board (although it's not a problem if two
   // labels have the same color).
   defaultColor() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
     const usedColors = _.pluck(labels, 'color');
     const availableColors = _.difference(labelColors, usedColors);
     return availableColors.length > 1 ? availableColors[0] : labelColors[0];
@@ -117,7 +117,7 @@ Template.createLabelPopup.events({
   // Create the new label
   'submit .create-label'(event, templateInstance) {
     event.preventDefault();
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
     const name = templateInstance
       .$('#labelName')
       .val()
@@ -130,13 +130,13 @@ Template.createLabelPopup.events({
 
 Template.editLabelPopup.events({
   'click .js-delete-label': Popup.afterConfirm('deleteLabel', function () {
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
     board.removeLabel(this._id);
     Popup.back(2);
   }),
   'submit .edit-label'(event, templateInstance) {
     event.preventDefault();
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
     const name = templateInstance
       .$('#labelName')
       .val()
diff --git a/client/components/lists/list.js b/client/components/lists/list.js
index c63b75fc5..51bee191d 100644
--- a/client/components/lists/list.js
+++ b/client/components/lists/list.js
@@ -75,7 +75,7 @@ BlazeComponent.extendComponent({
         const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1;
         const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards);
         const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
         const defaultSwimlaneId = currentBoard.getDefaultSwimline()._id;
         let targetSwimlaneId = null;
 
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 53b91baa9..92de5a66f 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -349,7 +349,7 @@ BlazeComponent.extendComponent({
         {
           match: /\B@([\w.-]*)$/,
           search(term, callback) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            const currentBoard = Utils.getCurrentBoard();
             callback(
               $.map(currentBoard.activeMembers(), member => {
                 const user = Users.findOne(member.userId);
@@ -374,7 +374,7 @@ BlazeComponent.extendComponent({
         {
           match: /\B#(\w*)$/,
           search(term, callback) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            const currentBoard = Utils.getCurrentBoard();
             callback(
               $.map(currentBoard.labels, label => {
                 if (label.name == undefined) {
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 33ef9026b..2e31bb16e 100644
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -13,7 +13,7 @@ BlazeComponent.extendComponent({
       {
         match: /\B@([\w.-]*)$/,
         search(term, callback) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           callback(
             _.union(
             currentBoard
@@ -328,7 +328,7 @@ Blaze.Template.registerHelper(
   new Template('mentions', function() {
     const view = this;
     let content = Blaze.toHTML(view.templateContentBlock);
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     if (!currentBoard)
       return HTML.Raw(
         DOMPurify.sanitize(content, { ALLOW_UNKNOWN_PROTOCOLS: true }),
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
index e319d7b7c..cb1b76734 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -18,7 +18,7 @@ BlazeComponent.extendComponent({
   },
 
   labels() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
     for (let i = 0; i < labels.length; i++) {
       if (labels[i].name === '' || labels[i].name === undefined) {
         labels[i].name = labels[i].color.toUpperCase();
diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js
index fbe064a76..120ee074c 100644
--- a/client/components/rules/triggers/cardTriggers.js
+++ b/client/components/rules/triggers/cardTriggers.js
@@ -5,7 +5,7 @@ BlazeComponent.extendComponent({
     this.subscribe('allRules');
   },
   labels() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
     for (let i = 0; i < labels.length; i++) {
       if (labels[i].name === '' || labels[i].name === undefined) {
         labels[i].name = labels[i].color;
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index b5b9b6fd3..9db5bb4cc 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -177,7 +177,7 @@ Template.memberPopup.helpers({
   memberType() {
     const type = Users.findOne(this.userId).isBoardAdmin() ? 'admin' : 'normal';
     if (type === 'normal') {
-      const currentBoard = Boards.findOne(Session.get('currentBoard'));
+      const currentBoard = Utils.getCurrentBoard();
       const commentOnly = currentBoard.hasCommentOnly(this.userId);
       const noComments = currentBoard.hasNoComments(this.userId);
       const worker = currentBoard.hasWorker(this.userId);
@@ -219,14 +219,14 @@ Template.boardMenuPopup.events({
   'click .js-board-info-on-my-boards': Popup.open('boardInfoOnMyBoards'),
   'click .js-change-language': Popup.open('changeLanguage'),
   'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     currentBoard.archive();
     // XXX We should have some kind of notification on top of the page to
     // confirm that the board was successfully archived.
     FlowRouter.go('home');
   }),
   'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     Popup.back();
     Boards.remove(currentBoard._id);
     FlowRouter.go('home');
@@ -301,13 +301,13 @@ Template.removeMemberPopup.helpers({
     return Users.findOne(this.userId);
   },
   board() {
-    return Boards.findOne(Session.get('currentBoard'));
+    return Utils.getCurrentBoard();
   },
 });
 
 Template.leaveBoardPopup.helpers({
   board() {
-    return Boards.findOne(Session.get('currentBoard'));
+    return Utils.getCurrentBoard();
   },
 });
 BlazeComponent.extendComponent({
@@ -658,7 +658,7 @@ BlazeComponent.extendComponent({
   },
 
   isSelected() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard.color === this.currentData().toString();
   },
 
@@ -666,7 +666,7 @@ BlazeComponent.extendComponent({
     return [
       {
         'click .js-select-background'(evt) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           const newColor = this.currentData().toString();
           currentBoard.setColor(newColor);
           evt.preventDefault();
@@ -681,7 +681,7 @@ BlazeComponent.extendComponent({
     return [
       {
         submit(event) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           const backgroundImageURL = this.find('.js-board-background-image-url').value.trim();
           currentBoard.setBackgroundImageURL(backgroundImageURL);
           Utils.setBackgroundImage();
@@ -689,7 +689,7 @@ BlazeComponent.extendComponent({
           event.preventDefault();
         },
         'click .js-remove-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           currentBoard.setBackgroundImageURL("");
           Popup.back();
           Utils.reload();
@@ -702,14 +702,14 @@ BlazeComponent.extendComponent({
 
 Template.boardChangeBackgroundImagePopup.helpers({
   backgroundImageURL() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard.backgroundImageURL;
   },
 });
 
 BlazeComponent.extendComponent({
   onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
   },
 
   allowsCardCounterList() {
@@ -762,7 +762,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
   },
 
   allowsSubtasks() {
@@ -888,7 +888,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
   },
 
   allowsReceivedDate() {
@@ -1323,7 +1323,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
   },
 
   allowsDescriptionTextOnMinicard() {
@@ -1489,7 +1489,7 @@ BlazeComponent.extendComponent({
         },
         'click .js-select-member'() {
           const userId = this.currentData().__originalId;
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           if (!currentBoard.hasMember(userId)) {
             this.inviteUser(userId);
           }
@@ -1545,7 +1545,7 @@ BlazeComponent.extendComponent({
           this.setError('');
         },
         'change #jsBoardOrgs'() {
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
           let selectElt = document.getElementById("jsBoardOrgs");
           let selectedOrgId = selectElt.options[selectElt.selectedIndex].value;
           let selectedOrgDisplayName = selectElt.options[selectElt.selectedIndex].text;
@@ -1619,7 +1619,7 @@ BlazeComponent.extendComponent({
         },
         'click #leaveBoardBtn'(){
           let stringOrgId = document.getElementById('hideOrgId').value;
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
           let boardOrganizations = [];
           if(currentBoard.orgs !== undefined){
             for(let i = 0; i < currentBoard.orgs.length; i++){
@@ -1690,7 +1690,7 @@ BlazeComponent.extendComponent({
           this.setError('');
         },
         'change #jsBoardTeams'() {
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
           let selectElt = document.getElementById("jsBoardTeams");
           let selectedTeamId = selectElt.options[selectElt.selectedIndex].value;
           let selectedTeamDisplayName = selectElt.options[selectElt.selectedIndex].text;
@@ -1799,7 +1799,7 @@ BlazeComponent.extendComponent({
         },
         'click #leaveBoardTeamBtn'(){
           let stringTeamId = document.getElementById('hideTeamId').value;
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
           let boardTeams = [];
           if(currentBoard.teams !== undefined){
             for(let i = 0; i < currentBoard.teams.length; i++){
@@ -1852,7 +1852,7 @@ Template.changePermissionsPopup.events({
   'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only, click .js-set-worker'(
     event,
   ) {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     const memberId = this.userId;
     const isAdmin = $(event.currentTarget).hasClass('js-set-admin');
     const isCommentOnly = $(event.currentTarget).hasClass(
@@ -1873,12 +1873,12 @@ Template.changePermissionsPopup.events({
 
 Template.changePermissionsPopup.helpers({
   isAdmin() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard.hasAdmin(this.userId);
   },
 
   isNormal() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return (
       !currentBoard.hasAdmin(this.userId) &&
       !currentBoard.hasNoComments(this.userId) &&
@@ -1888,7 +1888,7 @@ Template.changePermissionsPopup.helpers({
   },
 
   isNoComments() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return (
       !currentBoard.hasAdmin(this.userId) &&
       currentBoard.hasNoComments(this.userId)
@@ -1896,7 +1896,7 @@ Template.changePermissionsPopup.helpers({
   },
 
   isCommentOnly() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return (
       !currentBoard.hasAdmin(this.userId) &&
       currentBoard.hasCommentOnly(this.userId)
@@ -1904,14 +1904,14 @@ Template.changePermissionsPopup.helpers({
   },
 
   isWorker() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return (
       !currentBoard.hasAdmin(this.userId) && currentBoard.hasWorker(this.userId)
     );
   },
 
   isLastAdmin() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return (
       currentBoard.hasAdmin(this.userId) && currentBoard.activeAdmins() === 1
     );
diff --git a/client/components/sidebar/sidebarArchives.js b/client/components/sidebar/sidebarArchives.js
index d535d0822..2739d48c9 100644
--- a/client/components/sidebar/sidebarArchives.js
+++ b/client/components/sidebar/sidebarArchives.js
@@ -162,7 +162,7 @@ Template.archivesSidebar.helpers({
     return Meteor.user().isBoardAdmin();
   },
   isWorker() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return (
       !currentBoard.hasAdmin(this.userId) && currentBoard.hasWorker(this.userId)
     );
diff --git a/client/components/sidebar/sidebarSearches.js b/client/components/sidebar/sidebarSearches.js
index f5e8a5c82..a6e649ffb 100644
--- a/client/components/sidebar/sidebarSearches.js
+++ b/client/components/sidebar/sidebarSearches.js
@@ -4,12 +4,12 @@ BlazeComponent.extendComponent({
   },
 
   cards() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard.searchCards(this.term.get());
   },
 
   lists() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     return currentBoard.searchLists(this.term.get());
   },
 
diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js
index 5b9398ba3..331816821 100644
--- a/client/components/swimlanes/swimlaneHeader.js
+++ b/client/components/swimlanes/swimlaneHeader.js
@@ -61,7 +61,7 @@ BlazeComponent.extendComponent({
       {
         submit(event) {
           event.preventDefault();
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
           const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
           const titleInput = this.find('.swimlane-name-input');
           const title = titleInput.value.trim();
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 2cc3cb21d..ea42fec3b 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -239,7 +239,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
     this.isListTemplatesSwimlane =
       this.currentBoard.isTemplatesBoard() &&
       this.currentData().isListTemplatesSwimlane();
@@ -263,7 +263,7 @@ BlazeComponent.extendComponent({
           if (lastList) {
             const positionInput = this.find('.list-position-input');
             const position = positionInput.value.trim();
-            const ret = Lists.findOne({ boardId: Session.get('currentBoard'), _id: position, archived: false })
+            const ret = Lists.findOne({ boardId: Utils.getCurrentBoardId(), _id: position, archived: false })
             sortIndex = parseInt(JSON.stringify(ret['sort']))
             sortIndex = sortIndex+1
           } else {
@@ -350,7 +350,7 @@ class MoveSwimlaneComponent extends BlazeComponent {
   }
 
   board() {
-    return Boards.findOne(Session.get('currentBoard'));
+    return Utils.getCurrentBoard();
   }
 
   toBoardsSelector() {
diff --git a/client/lib/utils.js b/client/lib/utils.js
index 1f7361fec..c21bedcea 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -2,7 +2,7 @@ import { ReactiveCache } from '/imports/reactiveCache';
 
 Utils = {
   setBackgroundImage(url) {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     if (currentBoard.backgroundImageURL !== undefined) {
       $(".board-wrapper,.board-wrapper .board-canvas").css({"background":"url(" + currentBoard.backgroundImageURL + ")","background-size":"cover"});
       $(".swimlane,.swimlane .list,.swimlane .list .list-body,.swimlane .list:first-child .list-body").css({"background-color":"transparent"});
@@ -439,7 +439,7 @@ Utils = {
   },
 
   setCustomUI(data) {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
     if (currentBoard) {
       DocHead.setTitle(`${currentBoard.title} - ${data.productName}`);
     } else {
diff --git a/config/router.js b/config/router.js
index e5815745f..695d2bcc9 100644
--- a/config/router.js
+++ b/config/router.js
@@ -421,7 +421,7 @@ _.each(redirections, (newPath, oldPath) => {
 //Meteor.isClient && Meteor.startup(() => {
 //  Tracker.autorun(() => {
 
-//    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+//    const currentBoard = Utils.getCurrentBoard();
 //    const titleStack = [appTitle];
 //    if (currentBoard) {
 //      titleStack.push(currentBoard.title);