diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 2b65131a8..6ab4a0db6 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -371,6 +371,9 @@ li > p {
 .embed-preview-image {
   width: 100%;
   height: auto;
+}
+
+.embed-preview-image--clickable {
   cursor: pointer;
 }
 
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index fb24eadd1..6e3449e38 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -8,7 +8,10 @@ const template = `
   <ds-container width="small" class="embed-container">
     <section class="embed-content">
       <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
-      <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" @click.prevent="openOverlay()" />
+      <template v-else>
+        <img v-if="embedHtml && embedImage" :src="embedImage" class="embed-preview-image embed-preview-image--clickable" @click.prevent="openOverlay()" />
+        <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" />
+      </template>
       <h4 v-if="embedTitle">{{embedTitle}}</h4>
       <p v-if="embedDescription">{{embedDescription}}</p>
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>