diff --git a/client/src/components/Draftail/blocks/EmbedBlock.js b/client/src/components/Draftail/blocks/EmbedBlock.js
index 4af93c009..4a412cee6 100644
--- a/client/src/components/Draftail/blocks/EmbedBlock.js
+++ b/client/src/components/Draftail/blocks/EmbedBlock.js
@@ -15,7 +15,7 @@ const propTypes = {
  * Editor block to display media and edit content.
  */
 const EmbedBlock = props => {
-  const { entity, onEditEntity, onRemoveEntity } = props.blockProps;
+  const { entity, onRemoveEntity } = props.blockProps;
   const { url, title, thumbnail } = entity.getData();
 
   return (
@@ -30,10 +30,6 @@ const EmbedBlock = props => {
         {title}
       </a>
 
-      <button className="button Tooltip__button" onClick={onEditEntity}>
-        {STRINGS.EDIT}
-      </button>
-
       <button className="button button-secondary no Tooltip__button" onClick={onRemoveEntity}>
         {STRINGS.DELETE}
       </button>
diff --git a/client/src/components/Draftail/blocks/ImageBlock.js b/client/src/components/Draftail/blocks/ImageBlock.js
index 022944ab5..e819b2954 100644
--- a/client/src/components/Draftail/blocks/ImageBlock.js
+++ b/client/src/components/Draftail/blocks/ImageBlock.js
@@ -38,7 +38,7 @@ class ImageBlock extends Component {
 
   render() {
     const { blockProps } = this.props;
-    const { entity, onEditEntity, onRemoveEntity } = blockProps;
+    const { entity, onRemoveEntity } = blockProps;
     const { src, alt } = entity.getData();
 
     return (
@@ -48,10 +48,6 @@ class ImageBlock extends Component {
           <input className="ImageBlock__field__input" type="text" value={alt || ''} onChange={this.changeAlt} />
         </label>
 
-        <button className="button Tooltip__button" onClick={onEditEntity}>
-          {STRINGS.EDIT}
-        </button>
-
         <button className="button button-secondary no Tooltip__button" onClick={onRemoveEntity}>
           {STRINGS.DELETE}
         </button>
diff --git a/client/src/components/Draftail/blocks/__snapshots__/EmbedBlock.test.js.snap b/client/src/components/Draftail/blocks/__snapshots__/EmbedBlock.test.js.snap
index 8c2606885..2df6f2de5 100644
--- a/client/src/components/Draftail/blocks/__snapshots__/EmbedBlock.test.js.snap
+++ b/client/src/components/Draftail/blocks/__snapshots__/EmbedBlock.test.js.snap
@@ -22,11 +22,6 @@ exports[`EmbedBlock renders 1`] = `
   >
     Test title
   </a>
-  <button
-    className="button Tooltip__button"
-  >
-    Edit
-  </button>
   <button
     className="button button-secondary no Tooltip__button"
   >
diff --git a/client/src/components/Draftail/blocks/__snapshots__/ImageBlock.test.js.snap b/client/src/components/Draftail/blocks/__snapshots__/ImageBlock.test.js.snap
index edfce65f6..48553bbc7 100644
--- a/client/src/components/Draftail/blocks/__snapshots__/ImageBlock.test.js.snap
+++ b/client/src/components/Draftail/blocks/__snapshots__/ImageBlock.test.js.snap
@@ -29,11 +29,6 @@ exports[`ImageBlock alt 1`] = `
       value="Test"
     />
   </label>
-  <button
-    className="button Tooltip__button"
-  >
-    Edit
-  </button>
   <button
     className="button button-secondary no Tooltip__button"
   >
@@ -71,11 +66,6 @@ exports[`ImageBlock renders 1`] = `
       value=""
     />
   </label>
-  <button
-    className="button Tooltip__button"
-  >
-    Edit
-  </button>
   <button
     className="button button-secondary no Tooltip__button"
   >