diff --git a/wax-prosemirror-services/src/ImageService/plugins/captionPlugin.js b/wax-prosemirror-services/src/ImageService/plugins/captionPlugin.js
index 2061eed54d09e6ddda406f1f4023282f4cab7b6f..cf307e0b23da61c4713608015b189f501c01696d 100644
--- a/wax-prosemirror-services/src/ImageService/plugins/captionPlugin.js
+++ b/wax-prosemirror-services/src/ImageService/plugins/captionPlugin.js
@@ -119,7 +119,10 @@ const captionPlugin = key =>
             if (figCap[6] && figCap[6].type.name === 'figcaption') {
               const figCapEl = document.getElementById(figCap[6].attrs.id);
 
-              if (figCapEl.parentElement.firstChild.tagName === 'FIGCAPTION') {
+              if (
+                figCapEl &&
+                figCapEl.parentElement.firstChild.tagName === 'FIGCAPTION'
+              ) {
                 figCapEl.parentElement.remove();
               }
             }
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
index dbc600e1cceb25c8a8d565f5f4d2825af6e45e42..7ed8665c37d64f6e3584c105c087e5607c42aa89 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
@@ -6,7 +6,7 @@ import { StepMap } from 'prosemirror-transform';
 import { keymap } from 'prosemirror-keymap';
 import { baseKeymap } from 'prosemirror-commands';
 import { undo, redo } from 'prosemirror-history';
-import { WaxContext } from 'wax-prosemirror-core';
+import { WaxContext, ComponentPlugin } from 'wax-prosemirror-core';
 import Placeholder from '../plugins/placeholder';
 import FakeCursorPlugin from '../../MultipleDropDownService/plugins/FakeCursorPlugin';
 
@@ -50,6 +50,7 @@ const EditorWrapper = styled.div`
     }
   }
 `;
+let WaxOverlays = () => true;
 
 const EditorComponent = ({ node, view, getPos }) => {
   const editorRef = useRef();
@@ -96,6 +97,7 @@ const EditorComponent = ({ node, view, getPos }) => {
   ]);
 
   useEffect(() => {
+    WaxOverlays = ComponentPlugin('waxOverlays');
     questionView = new EditorView(
       {
         mount: editorRef.current,
@@ -176,6 +178,7 @@ const EditorComponent = ({ node, view, getPos }) => {
   return (
     <EditorWrapper>
       <div ref={editorRef} />
+      <WaxOverlays activeViewId={questionId} />
     </EditorWrapper>
   );
 };