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 7797e59791..8dbf83a678 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -629,14 +629,15 @@ define [
 			_setUserTCState(project.owner._id, newValue, isLocal)
 
 		_setGuestsTCState = (newValue, isLocal = false) ->
-			$scope.reviewPanel.trackChangesOnForGuests = newValue
-			if (
-				ide.$scope.project.publicAccesLevel == 'tokenBased' &&
-				ide.$scope.isTokenMember &&
-				ide.$scope?.user?.id?
-			)
-				$scope.trackChangesOnForThisGuestClient = newValue
-				_setUserTCState(ide.$scope.user.id, newValue, isLocal)
+			if $scope.reviewPanel.trackChangesForGuestsAvailable
+				$scope.reviewPanel.trackChangesOnForGuests = newValue
+				if (
+					ide.$scope.project.publicAccesLevel == 'tokenBased' &&
+					ide.$scope.isTokenMember &&
+					ide.$scope?.user?.id?
+				)
+					$scope.trackChangesOnForThisGuestClient = newValue
+					_setUserTCState(ide.$scope.user.id, newValue, isLocal)
 
 		applyClientTrackChangesStateToServer = () ->
 			data = {}