diff --git a/plugins/text-editor-resources/package.json b/plugins/text-editor-resources/package.json
index 5c9dd05117..9fd642347b 100644
--- a/plugins/text-editor-resources/package.json
+++ b/plugins/text-editor-resources/package.json
@@ -42,6 +42,7 @@
     "@hcengineering/platform": "^0.6.11",
     "svelte": "^4.2.12",
     "@hcengineering/ui": "^0.6.15",
+    "@hcengineering/analytics": "^0.6.0",
     "@hcengineering/presentation": "^0.6.3",
     "@hcengineering/core": "^0.6.32",
     "@hcengineering/view": "^0.6.13",
diff --git a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
index 304395eba2..0b1982db3a 100644
--- a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
+++ b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
@@ -15,6 +15,7 @@
 //
 -->
 <script lang="ts">
+  import { Analytics } from '@hcengineering/analytics'
   import { type Space, type Class, type CollaborativeDoc, type Doc, type Ref } from '@hcengineering/core'
   import { IntlString, translate } from '@hcengineering/platform'
   import { getFileUrl, getImageSize, imageSizeToRatio } from '@hcengineering/presentation'
@@ -116,11 +117,12 @@
       objectAttr
     })
 
+  let contentError = false
   let localSynced = false
   let remoteSynced = false
 
   $: loading = !localSynced && !remoteSynced
-  $: editable = !readonly && remoteSynced
+  $: editable = !readonly && !contentError && remoteSynced
 
   void localProvider.loaded.then(() => (localSynced = true))
   void remoteProvider.loaded.then(() => (remoteSynced = true))
@@ -218,7 +220,10 @@
   }
 
   $: if (editor !== undefined) {
-    editor.setEditable(editable, true)
+    // When the content is invalid, we don't want to emit an update
+    // Preventing synchronization of the invalid content
+    const emitUpdate = !contentError
+    editor.setEditable(editable, emitUpdate)
   }
 
   // TODO: should be inside the editor
@@ -364,6 +369,7 @@
     await ph
 
     editor = new Editor({
+      enableContentCheck: true,
       element,
       editorProps: { attributes: mergeAttributes(defaultEditorAttributes, editorAttributes, { class: 'flex-grow' }) },
       extensions: [
@@ -432,6 +438,11 @@
 
         throttle.call(updateLastUpdateTime)
         dispatch('update')
+      },
+      onContentError: ({ error, disableCollaboration }) => {
+        disableCollaboration()
+        contentError = true
+        Analytics.handleError(error)
       }
     })
   })
diff --git a/plugins/text-editor-resources/src/components/TextEditor.svelte b/plugins/text-editor-resources/src/components/TextEditor.svelte
index 26e45a7946..ff018f894e 100644
--- a/plugins/text-editor-resources/src/components/TextEditor.svelte
+++ b/plugins/text-editor-resources/src/components/TextEditor.svelte
@@ -14,6 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import { Analytics } from '@hcengineering/analytics'
   import { Markup } from '@hcengineering/core'
   import { IntlString, translate } from '@hcengineering/platform'
   import { EmptyMarkup, getMarkup, markupToJSON } from '@hcengineering/text'
@@ -150,6 +151,7 @@
   onMount(() => {
     void ph.then(async () => {
       editor = new Editor({
+        enableContentCheck: true,
         element,
         editorProps: {
           attributes: mergeAttributes(defaultEditorAttributes, editorAttributes),
@@ -197,6 +199,9 @@
           content = getContent()
           dispatch('value', content)
           dispatch('update', content)
+        },
+        onContentError: ({ error }) => {
+          Analytics.handleError(error)
         }
       })
     })