diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index fc86990e62..2c235df182 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -101,7 +101,7 @@
 				review-panel-toggle(
 					ng-model="reviewPanel.trackChangesOnForGuests"
 					on-toggle="toggleTrackChangesForGuests(isOn);"
-					disabled="!project.features.trackChanges || !permissions.write || !trackChangesForGuestsAvailable"
+					disabled="!project.features.trackChanges || !permissions.write || !reviewPanel.trackChangesForGuestsAvailable"
 				)
 
 	.rp-entry-list(
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 8dbf83a678..6b6740c115 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -82,8 +82,8 @@ define [
 
 		$scope.$watch 'project.publicAccesLevel', (level) ->
 			if level?
-				available = $scope.trackChangesForGuestsAvailable = level == 'tokenBased'
-				if !available
+				$scope.reviewPanel.trackChangesForGuestsAvailable = level == 'tokenBased'
+				if !$scope.reviewPanel.trackChangesForGuestsAvailable
 					$scope.trackChangesOnForThisGuestClient = false
 					$scope.toggleTrackChangesForGuests false
 
@@ -638,6 +638,10 @@ define [
 				)
 					$scope.trackChangesOnForThisGuestClient = newValue
 					_setUserTCState(ide.$scope.user.id, newValue, isLocal)
+			else
+				$scope.reviewPanel.trackChangesOnForGuests = false
+				$scope.trackChangesOnForThisGuestClient = false
+				_setUserTCState(ide.$scope.user.id, false, isLocal)
 
 		applyClientTrackChangesStateToServer = () ->
 			data = {}