diff --git a/editors/demo/src/Editoria/config/config.js b/editors/demo/src/Editoria/config/config.js
index 31bc56977698f96c4ae2dbf22cb5c0ae808c62c1..35325a79dfa790596301d94b0d9259ef607a5776 100644
--- a/editors/demo/src/Editoria/config/config.js
+++ b/editors/demo/src/Editoria/config/config.js
@@ -27,6 +27,7 @@ import {
   BlockDropDownToolGroupService,
   AskAiContentService,
   // YjsService,
+  CommentDecoration,
 } from 'wax-prosemirror-services';
 
 import { TablesService, tableEditing, columnResizing } from 'wax-table-service';
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 95b5a5596a5545d5e9c7daf290e380fdae1736fa..32f70e7d1af089a4e4e96fb75e225417bb7364d3 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -36,6 +36,10 @@ ToolGroups
 */
 export { default as DisplayTextToolGroupService } from './src/WaxToolGroups/DisplayTextToolGroupService/DisplayTextToolGroupService';
 export { default as BlockDropDownToolGroupService } from './src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownToolGroupService';
-/* Plugins */
 
+/* Plugins */
 export { default as disallowPasteImagesPlugin } from './src/ImageService/plugins/disallowPasteImagesPlugin';
+export {
+  CommentDecorationPlugin,
+  CommentDecorationPluginKey,
+} from './src/CommentsService/plugins/CommentDecorationPlugin';
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 826da5abed83f33f0b6a4420fe6564348313ca75..1a732f086b3f88cc2cb3fb3372d8ec5b95c633a6 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -40,7 +40,13 @@ export default class CommentsService extends Service {
           ...items,
         ]);
         commentsConfig.getComments(this.allCommentsFromStates);
-
+        if (this.app.context.options.resolvedComment) {
+          this.allCommentsFromStates = this.allCommentsFromStates.filter(
+            comm => {
+              return comm.id !== this.app.context.options.resolvedComment;
+            },
+          );
+        }
         this.app.context.setOption({ comments: this.allCommentsFromStates });
       },
     };
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
index bf7ad252f8935e016deda694b382a5f70abcaf9b..ee0ee2baabbd16bd7838e3f1692fb60e24998ead 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedComment.js
@@ -106,21 +106,16 @@ export default ({ comment, top, commentId, recalculateTops, users }) => {
   };
 
   const onClickResolve = () => {
+    context.setOption({ resolvedComment: activeComment.id });
     dispatch(
       state.tr.setMeta(CommentDecorationPluginKey, {
         type: 'deleteComment',
         id: activeComment.id,
       }),
     );
-    // recalculateTops();
+
+    dispatch(state.tr);
     activeView.focus();
-    setTimeout(() => {
-      const newComments = comments.filter(comm => {
-        return comm.id !== activeComment.id;
-      });
-      context.setOption({ comments: newComments });
-      dispatch(state.tr);
-    });
   };
 
   const onTextAreaBlur = () => {