diff --git a/wax-prosemirror-components/src/components/TitleButton.js b/wax-prosemirror-components/src/components/TitleButton.js
index f3c14f7e0d05c3e6a415a4c527c33b1ef773eb66..546255f9f67328681d49cacae81b1b80b0391f23 100644
--- a/wax-prosemirror-components/src/components/TitleButton.js
+++ b/wax-prosemirror-components/src/components/TitleButton.js
@@ -34,9 +34,10 @@ const TitleButton = ({ view = {}, item }) => {
 
   useEffect(() => {
     if (titleNode[0]) {
-      serviceConfig.updateTitle(titleNode[0].node.textContent);
+      if (serviceConfig)
+        serviceConfig.updateTitle(titleNode[0].node.textContent);
     } else {
-      serviceConfig.updateTitle('');
+      if (serviceConfig) serviceConfig.updateTitle('');
     }
   }, [chapterTitle]);
 
diff --git a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
index f939fcee8f6418a141b7ab4c40b10240e1aa304b..7eb5fc8773607e3adadd2556b1aaa9f3579160d0 100644
--- a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
+++ b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
@@ -81,7 +81,9 @@ const dropDownOptions = [
 
 const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
   const { app, activeView, pmViews } = useContext(WaxContext);
-  const enableService = app.config.get('config.EnableTrackChangeService');
+  const enableService = app.config.get('config.EnableTrackChangeService')
+    ? app.config.get('config.EnableTrackChangeService')
+    : { toggle: false };
   const isDisabled = enableService.toggle;
 
   const isEditable = pmViews.main.props.editable(editable => {
diff --git a/wax-prosemirror-core/src/Wax.js b/wax-prosemirror-core/src/Wax.js
index b94cde27fd140f08badd06679d5f1410c0ba5a92..a06ea9defa0eebe0de354687d05058cc99f647c3 100644
--- a/wax-prosemirror-core/src/Wax.js
+++ b/wax-prosemirror-core/src/Wax.js
@@ -62,8 +62,6 @@ const Wax = forwardRef((props, ref) => {
     helpers.revertNotesSchema(schema);
   };
 
-  const TrackChange = application.config.get('config.EnableTrackChangeService');
-
   const Layout = application.container.get('Layout');
   if (layout) Layout.setLayout(layout);
   const WaxRender = Layout.layoutComponent;
@@ -82,7 +80,10 @@ const Wax = forwardRef((props, ref) => {
           ref={ref}
           serializer={serializer}
           targetFormat={targetFormat}
-          TrackChange={TrackChange}
+          TrackChange={
+            application.config.get('config.EnableTrackChangeService') ||
+            undefined
+          }
           user={user}
           value={value}
         >