diff --git a/packages/blocks-editor/src/Editor/BlocksEditor.tsx b/packages/blocks-editor/src/Editor/BlocksEditor.tsx
index cebf8c017..783de5f47 100644
--- a/packages/blocks-editor/src/Editor/BlocksEditor.tsx
+++ b/packages/blocks-editor/src/Editor/BlocksEditor.tsx
@@ -58,9 +58,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
         handleEditorChange(editorState, previewLength, onChange)
       })
     },
-    // Ignoring 'ignoreFirstChange' and 'previewLength'
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [onChange, didIgnoreFirstChange],
+    [ignoreFirstChange, didIgnoreFirstChange, previewLength, onChange],
   )
 
   const [floatingAnchorElem, setFloatingAnchorElem] = useState<HTMLDivElement | null>(null)
diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx b/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx
index ce5847b17..24b50a2fe 100644
--- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/SuperEditor/SuperEditor.tsx
@@ -177,7 +177,6 @@ export const SuperEditor: FunctionComponent<Props> = ({
             >
               <BlocksEditor
                 onChange={handleChange}
-                ignoreFirstChange={controller.isTemplateNote}
                 className={classNames(
                   'blocks-editor relative h-full resize-none px-4 py-4 focus:shadow-none focus:outline-none',
                   lineHeight && `leading-${lineHeight.toLowerCase()}`,