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 6b6740c115..d69aba4208 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -640,8 +640,9 @@ define [
 					_setUserTCState(ide.$scope.user.id, newValue, isLocal)
 			else
 				$scope.reviewPanel.trackChangesOnForGuests = false
-				$scope.trackChangesOnForThisGuestClient = false
-				_setUserTCState(ide.$scope.user.id, false, isLocal)
+				if $scope.isTokenMember
+					$scope.trackChangesOnForThisGuestClient = false
+					_setUserTCState(ide.$scope.user.id, false, isLocal)
 
 		applyClientTrackChangesStateToServer = () ->
 			data = {}