diff --git a/apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx b/apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx
index e19032d46..d2eb5484a 100644
--- a/apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx
+++ b/apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx
@@ -182,7 +182,7 @@ export default function CKEditorWithWatchdog({ containerRef: externalContainerRe
         watchdog.create(container);
 
         return () => watchdog.destroy();
-    }, [ contentLanguage, templates, uiLanguage ]);
+    }, [ containerRef, externalWatchdogRef, onEditorInitialized, onWatchdogStateChange, contentLanguage, templates, uiLanguage, watchdogConfig, isClassicEditor ]);
 
     // React to notification warning callback.
     useEffect(() => {
diff --git a/apps/client/src/widgets/type_widgets/text/EditableText.tsx b/apps/client/src/widgets/type_widgets/text/EditableText.tsx
index b5d7bfe0b..c23443b73 100644
--- a/apps/client/src/widgets/type_widgets/text/EditableText.tsx
+++ b/apps/client/src/widgets/type_widgets/text/EditableText.tsx
@@ -232,7 +232,7 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
                     // A threshold specifying the number of errors (defaults to 3). After this limit is reached and the time between last errors is shorter than minimumNonErrorTimePeriod, the watchdog changes its state to crashedPermanently, and it stops restarting the editor. This prevents an infinite restart loop.
                     crashNumberLimit: 10,
                     // A minimum number of milliseconds between saving the editor data internally (defaults to 5000). Note that for large documents, this might impact the editor performance.
-                    saveInterval: 5000
+                    saveInterval: Number.MAX_SAFE_INTEGER
                 }}
                 templates={templates}
                 onNotificationWarning={onNotificationWarning}