diff --git a/editors/demo/src/Editoria/Editoria.js b/editors/demo/src/Editoria/Editoria.js
index 9bda4b1134b3737b5871a9376d44bbe0f478a44d..3a72be1e77c3730d05315f894139f42e27619975 100644
--- a/editors/demo/src/Editoria/Editoria.js
+++ b/editors/demo/src/Editoria/Editoria.js
@@ -53,9 +53,9 @@ const Editoria = () => {
           value={demo}
           // readonly
           layout={layout}
-          onChange={debounce(source => {
-            console.log(JSON.stringify(source));
-          }, 200)}
+          // onChange={debounce(source => {
+          //   console.log(JSON.stringify(source));
+          // }, 200)}
           user={user}
           scrollMargin={200}
           scrollThreshold={200}
diff --git a/wax-prosemirror-core/src/WaxContext.js b/wax-prosemirror-core/src/WaxContext.js
index d97ec379c28c616b9f6b18945d31ae29ab0c433d..4d3ee58f9760b54b40e156a29e7b0f38a6ed72b1 100644
--- a/wax-prosemirror-core/src/WaxContext.js
+++ b/wax-prosemirror-core/src/WaxContext.js
@@ -18,7 +18,7 @@ export default props => {
     pmViews: props.view || {},
     activeView: props.activeView || {},
     activeViewId: props.activeViewId || {},
-    options: { fullScreen: false },
+    options: { fullScreen: false, AiOn: false },
     transaction: {},
     setTransaction: tr => {
       Object.assign(context.transaction, tr);
diff --git a/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js b/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js
index 412a613512edecd6dad70ced36e241de238439d0..ddadd7b7cae61c4e71fb799f7bfe70977a448d60 100644
--- a/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js
+++ b/wax-prosemirror-services/src/AiService/components/ToggleAiComponent.js
@@ -23,8 +23,10 @@ const ToggleAiComponent = () => {
   if (!isEditable) isDisabled = true;
 
   const handleChange = () => {
-    setChecked(!checked);
     context.setOption({ AiOn: !checked });
+    setChecked(!checked);
+    main.dispatch(main.state.tr.setMeta('addToHistory', false));
+    main.focus();
   };
 
   return useMemo(