diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index d32db57ec3..671baabe7d 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -65,6 +65,7 @@
 				review-panel-toggle(
 					ng-model="reviewPanel.trackChangesOnForEveryone"
 					on-toggle="toggleTrackChangesForEveryone(isOn);"
+					disabled="!project.features.trackChanges"
 				)
 					//- disabled="!project.features.trackChanges"
 					//- on-disabled-click="openTrackChangesUpgradeModal"
@@ -76,7 +77,7 @@
 				review-panel-toggle(
 					ng-model="reviewPanel.trackChangesState[project.owner._id].value"
 					on-toggle="toggleTrackChangesForUser(isOn, project.owner._id);"
-					disabled="reviewPanel.trackChangesOnForEveryone"
+					disabled="reviewPanel.trackChangesOnForEveryone || !project.features.trackChanges"
 				)
 			li.rp-tc-state-item(ng-repeat="member in project.members")
 				span.rp-tc-state-item-name(
@@ -86,7 +87,7 @@
 				review-panel-toggle(
 					ng-model="reviewPanel.trackChangesState[member._id].value"
 					on-toggle="toggleTrackChangesForUser(isOn, member._id);"
-					disabled="reviewPanel.trackChangesOnForEveryone"
+					disabled="reviewPanel.trackChangesOnForEveryone || !project.features.trackChanges"
 				)
 			
 		//- span.review-panel-toolbar-label(ng-if="permissions.write")
diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index 54e825dc70..f0d8c113fd 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -576,7 +576,10 @@ define [
 			ide.editorManager.openDocId(doc_id, { gotoOffset: entry.offset })
 
 		$scope.toggleFullTCStateCollapse = () ->
-			reviewPanel.fullTCStateCollapsed = !reviewPanel.fullTCStateCollapsed
+			if $scope.project.features.trackChanges
+				reviewPanel.fullTCStateCollapsed = !reviewPanel.fullTCStateCollapsed
+			else
+				$scope.openTrackChangesUpgradeModal()
 
 		_setUserTCState = (userId, newValue, isLocal = false) ->
 			$scope.reviewPanel.trackChangesState[userId] ?= {}
diff --git a/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee b/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
index 0a71cc919d..6f2288634b 100644
--- a/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
+++ b/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
@@ -8,14 +8,14 @@ define [
 			ngModel: '='
 			valWhenUndefined: '=?'
 			disabled: '=?'
-			onDisabledClick: '=?'
+			onDisabledClick: '&?'
 		link: (scope) ->
 			if !scope.disabled?
 				scope.disabled = false
 			scope.onChange = (args...) ->
 				scope.onToggle({ isOn: scope.localModel })
 			scope.handleClick = () ->
-				if scope.disabled
+				if scope.disabled and scope.onDisabledClick?
 					scope.onDisabledClick()
 			scope.localModel = scope.ngModel
 			scope.$watch "ngModel", (value) ->