diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index d4951fbd2..4d54b088c 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -486,4 +486,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	$scope.unreadCommentCount = function(card) {
 		return card.commentsUnread;
 	};
+
+	$scope.isTimelineEnabled = function() {
+		return OCP.Comments && OCA.Activity;
+	};
+
 });
diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index e738c4c68..c3de3a4fa 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -278,4 +278,8 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 		};
 	};
 
+	$scope.isTimelineEnabled = function() {
+		return OCP.Comments && OCA.Activity;
+	};
+
 });
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index 369e71649..6519e7e70 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -16,7 +16,7 @@
     <li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><?php p($l->t('Tags')); ?></a></li>
     <li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}"><a><?php p($l->t('Deleted Stacks')); ?></a></li>
     <li class="tabHeader" ng-class="{'selected': (params.tab==3)}" ui-sref="{tab: 3}"><a><?php p($l->t('Deleted Cards')); ?></a></li>
-	<li class="tabHeader" ng-class="{'selected': (params.tab==4)}" ui-sref="{tab: 4}"><a><?php p($l->t('Activity')); ?></a></li>
+	<li class="tabHeader" ng-class="{'selected': (params.tab==4)}" ui-sref="{tab: 4}" ng-if="isTimelineEnabled()"><a><?php p($l->t('Timeline')); ?></a></li>
 
 </ul>
 <div class="tabsContainer">
@@ -150,7 +150,7 @@
     	</ul>
     </div>
 
-	<div id="board-detail-activity" class="tab activityTabView" ng-if="params.tab==4">
+	<div id="board-detail-activity" class="tab activityTabView" ng-if="isTimelineEnabled() && params.tab==4">
 		<activity-component ng-if="boardservice.getCurrent()" type="deck_board" element="boardservice.getCurrent()"></activity-component>
 	</div>
 
diff --git a/templates/part.card.php b/templates/part.card.php
index 325af78a7..a2913e63e 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -92,8 +92,7 @@
 		<ul class="tabHeaders ng-scope">
 			<li class="tabHeader" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><a><span class="icon icon-description"></span><?php p($l->t('Description')); ?></a></li>
 			<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><span class="icon icon-files-dark"></span><?php p($l->t('Attachments')); ?></a></li>
-			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}"><a><span class="icon icon-activity"></span><?php p($l->t('Activity/Comments')); ?></a></li>
-
+			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}" ng-if="isTimelineEnabled()"><a><span class="icon icon-activity"></span><?php p($l->t('Timeline')); ?></a></li>
 		</ul>
 		<div class="tabDetails">
 			<span class="save-indicator saved"><?php p($l->t('Saved')); ?></span>
@@ -131,7 +130,7 @@
 		</div>
 	</div>
 
-	<div class="section-content card-activity activityTabView" ng-if="params.tab === 2">
+	<div class="section-content card-activity activityTabView" ng-if="isTimelineEnabled() && params.tab === 2">
 		<activity-component type="deck_card" element="cardservice.getCurrent()"></activity-component>
 	</div>