2 files changed, 11 insertions, 5 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 9e4b9c61..3a40921d 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -29,7 +29,8 @@ template(name="boardBody")
         +calendarView
 
 template(name="calendarView")
-  .calendar-view.swimlane
-    if currentCard
-      +cardDetails(currentCard)
-    +fullcalendar(calendarOptions)
+  if isViewCalendar
+    .calendar-view.swimlane
+      if currentCard
+        +cardDetails(currentCard)
+      +fullcalendar(calendarOptions)
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index ae5b67fd..2de8777a 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -134,7 +134,7 @@ BlazeComponent.extendComponent({
 
   isViewCalendar() {
     const currentUser = Meteor.user();
-    if (!currentUser) return true;
+    if (!currentUser) return false;
     return (currentUser.profile.boardView === 'board-view-cal');
   },
 
@@ -264,4 +264,9 @@ BlazeComponent.extendComponent({
       },
     };
   },
+  isViewCalendar() {
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return (currentUser.profile.boardView === 'board-view-cal');
+  },
 }).register('calendarView');