diff --git a/editors/demo/src/Editoria/config/config.js b/editors/demo/src/Editoria/config/config.js
index b120dd1c074deda4a1c2f24a0406cd09ab5c0d83..fc3926bfd4bf5e3951eda10e73435919a223f9be 100644
--- a/editors/demo/src/Editoria/config/config.js
+++ b/editors/demo/src/Editoria/config/config.js
@@ -150,16 +150,16 @@ export default {
       { label: 'custom-tag-label-3', tagType: 'block' },
       { label: 'label 2', tagType: 'block' },
     ],
-    // updateTags: saveTags,
-  },
-  YjsService: {
-    // eslint-disable-next-line no-restricted-globals
-    connectionUrl: 'ws://localhost:4000',
-    docIdentifier: 'prosemirror-demo',
+    updateTags: saveTags,
   },
+  // YjsService: {
+  //   // eslint-disable-next-line no-restricted-globals
+  //   connectionUrl: 'ws://localhost:4000',
+  //   docIdentifier: 'prosemirror-demo',
+  // },
 
   services: [
-    new YjsService(),
+    // new YjsService(),
     new CustomTagService(),
     new DisplayBlockLevelService(),
     new DisplayToolGroupService(),
diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index 0ffa6e0962d7df6fc6678274d594c45776e4043d..9e14f6ac6c5dfb292ff737394c05d66b8ce35c76 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -73,7 +73,7 @@ const Editors = () => {
       case 'oen':
         return <OEN />;
       default:
-        return <Editoria />;
+        return <HHMI />;
     }
   };
 
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
index 347e79156c7b792449f6dd4eb3ba6dfca711fffa..e9b6d9cf4cde7fc4e85c11dae975fc981a1633e0 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
@@ -83,6 +83,7 @@ export default ({ comment, top, commentId, recalculateTops }) => {
           commentMark,
         ),
       );
+
       activeView.dispatch(
         activeView.state.tr
           .addMark(