diff --git a/editor/src/components/canvas/controls/comment-indicator.tsx b/editor/src/components/canvas/controls/comment-indicator.tsx
index 42d712ce88a4..cacaa915c5e4 100644
--- a/editor/src/components/canvas/controls/comment-indicator.tsx
+++ b/editor/src/components/canvas/controls/comment-indicator.tsx
@@ -45,7 +45,13 @@ export const CommentIndicators = React.memo(() => {
     'CommentIndicator projectId',
   )
 
-  if (projectId == null) {
+  const mode = useEditorState(
+    Substores.restOfEditor,
+    (store) => store.editor.mode.type,
+    'CommentIndicators mode',
+  )
+
+  if (projectId == null || mode === 'live') {
     return null
   }