diff --git a/editors/demo/src/Editoria/Editoria.js b/editors/demo/src/Editoria/Editoria.js
index 3e85568eaea88403be4213b9ad9291685b3f3d73..8837b278e3d8c3e0e7c6f5a3ea237f63a71cfb22 100644
--- a/editors/demo/src/Editoria/Editoria.js
+++ b/editors/demo/src/Editoria/Editoria.js
@@ -55,7 +55,7 @@ const Editoria = () => {
           autoFocus
           placeholder="Type Something..."
           fileUpload={file => renderImage(file)}
-          // value={demo}
+          value={demo}
           // readonly
           layout={layout}
           // onChange={debounce(source => {
diff --git a/wax-prosemirror-services/src/CommentsService/components/RightArea.js b/wax-prosemirror-services/src/CommentsService/components/RightArea.js
index 49ff827a2370f6eb31aae7f3ac99bdcf8caa32b5..8ce766e6ad1e974fe84813d518f9e3d6cd52c6bd 100644
--- a/wax-prosemirror-services/src/CommentsService/components/RightArea.js
+++ b/wax-prosemirror-services/src/CommentsService/components/RightArea.js
@@ -79,6 +79,13 @@ export default ({ area, users }) => {
             markNodeEl.getBoundingClientRect().top -
             WaxSurface.top +
             parseInt(WaxSurfaceMarginTop.slice(0, -2), 10);
+        } else {
+          // comment is deleted
+          context.setOption({
+            comments: comments.filter(comment => {
+              return comment.id !== id;
+            }),
+          });
         }
       } else {
         // Notes