diff --git a/packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts b/packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts
index 4082db5d19f..3038191d5fe 100644
--- a/packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts
+++ b/packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts
@@ -154,18 +154,16 @@ export class ModelsHandler {
   }
 
   public clearComments() {
-    if (this.sandbox.featureFlags.comments) {
-      Object.values(this.moduleModels).forEach(moduleModel => {
-        if (!moduleModel.model) {
-          return;
-        }
-        moduleModel.comments = [];
-        moduleModel.currentCommentDecorations = moduleModel.model.deltaDecorations(
-          moduleModel.currentCommentDecorations,
-          []
-        );
-      });
-    }
+    Object.values(this.moduleModels).forEach(moduleModel => {
+      if (!moduleModel.model) {
+        return;
+      }
+      moduleModel.comments = [];
+      moduleModel.currentCommentDecorations = moduleModel.model.deltaDecorations(
+        moduleModel.currentCommentDecorations,
+        []
+      );
+    });
   }
 
   public isModuleOpened(module: Module) {
diff --git a/packages/app/src/app/overmind/effects/vscode/index.ts b/packages/app/src/app/overmind/effects/vscode/index.ts
index 032f4687611..bbe2c780c65 100644
--- a/packages/app/src/app/overmind/effects/vscode/index.ts
+++ b/packages/app/src/app/overmind/effects/vscode/index.ts
@@ -29,6 +29,7 @@ import * as childProcess from 'node-services/lib/child_process';
 import { TextOperation } from 'ot';
 import { json } from 'overmind';
 import io from 'socket.io-client';
+import { hasPermission } from '@codesandbox/common/lib/utils/permission';
 
 import { EXTENSIONS_LOCATION, VIM_EXTENSION_ID } from './constants';
 import {
@@ -1202,7 +1203,11 @@ export class VSCodeEffect {
 
       this.modelCursorPositionListener = activeEditor.onDidChangeCursorPosition(
         cursor => {
-          if (sandbox?.featureFlags.comments) {
+          if (
+            sandbox &&
+            sandbox.featureFlags.comments &&
+            hasPermission(sandbox.authorization, 'comment')
+          ) {
             const model = activeEditor.getModel();
 
             this.modelsHandler.updateLineCommentIndication(