diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js b/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
index aed8e0827c3373cedb18fb8202cc86d529b236ac..00187f37ef6769b039e8763df9f26648d43a7074 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
+++ b/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
@@ -9,7 +9,6 @@ import React, {
 import styled from 'styled-components';
 import { grid, th } from '@pubsweet/ui-toolkit';
 import { WaxContext } from 'wax-prosemirror-core';
-import { DocumentHelpers } from 'wax-prosemirror-utilities';
 import { v4 as uuidv4 } from 'uuid';
 import Icon from '../../helpers/Icon';
 
@@ -104,12 +103,20 @@ const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
     customTagsConfig && customTagsConfig.tags
       ? customTagsConfig.tags
       : initialArr;
+
   const saveTags =
     customTagsConfig && customTagsConfig.updateTags
       ? customTagsConfig.updateTags
       : () => true;
   const [allTags, setAllTags] = useState(configTags);
 
+  let image = false;
+  state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+    if (node.type.name === 'image') {
+      image = true;
+    }
+  });
+
   const onChangeTagName = () => {
     setInputValue(ref.current.value);
   };
@@ -193,7 +200,7 @@ const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
 
   const styles = $from.pos === $to.pos ? disabledStyles : {};
 
-  return isCustomTagInline === true ? (
+  return isCustomTagInline === true && !image ? (
     <Wrapper>
       <InlineHeader>Custom Inline</InlineHeader>
       {inlineTags.map(item => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
index cb07816bf7c506dd466ec057a1b91f4e98d0ca20..3dd460550c4f71b81f0bb052c30c4251ab46359d 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
@@ -24,7 +24,7 @@ class Heading2 extends Tools {
       if (activeViewId !== 'main') return false;
       const { from, to } = state.selection;
       state.doc.nodesBetween(from, to, (node, pos) => {
-        if (node.type.name === 'list_item') {
+        if (node.type.name === 'list_item' || node.type.name === 'image') {
           isActive = false;
         }
       });
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
index a4d4448106d984ace70c1d885ab65273bf79d76c..21a99033e07792b61cace70df0f20a5b012904b0 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
@@ -24,7 +24,7 @@ class Heading3 extends Tools {
       if (activeViewId !== 'main') return false;
       const { from, to } = state.selection;
       state.doc.nodesBetween(from, to, (node, pos) => {
-        if (node.type.name === 'list_item') {
+        if (node.type.name === 'list_item' || node.type.name === 'image') {
           isActive = false;
         }
       });
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js
index 013e735f9c5e6933fda3ba2ea86441e8763ac1c2..fdc4e4ffe33d4132ae6cb0221e470cefcd6a3cc6 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading4.js
@@ -24,7 +24,7 @@ class Heading4 extends Tools {
       if (activeViewId !== 'main') return false;
       const { from, to } = state.selection;
       state.doc.nodesBetween(from, to, (node, pos) => {
-        if (node.type.name === 'list_item') {
+        if (node.type.name === 'list_item' || node.type.name === 'image') {
           isActive = false;
         }
       });