diff --git a/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl b/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl
index f12d070c..1a893e05 100644
--- a/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl
+++ b/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl
@@ -13,7 +13,11 @@
    ",
   </#if>
   <#if embeddedMessage.attachments?size gt 0>
-  "imageUrl": "${embeddedMessage.attachments[0].proxyUrl}",
+  ,"imageUrl": "${embeddedMessage.attachments[0].proxyUrl}"
+  <#elseif embeddedMessage.attachments?size = 0 && embeddedMessage.embeds?size gt 0 && embeddedMessage.embeds[0].cachedThumbnail??>
+  ,"imageUrl": "${embeddedMessage.embeds[0].cachedThumbnail.proxyUrl}"
+  <#elseif embeddedMessage.attachments?size = 0 && embeddedMessage.embeds?size gt 0 && embeddedMessage.embeds[0].cachedImageInfo??>
+  ,"imageUrl": "${embeddedMessage.embeds[0].cachedImageInfo.proxyUrl}"
   </#if>
   "fields": [
     {
diff --git a/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl b/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl
index 10cccdcd..2e47b0b3 100644
--- a/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl
+++ b/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl
@@ -24,9 +24,10 @@
   </#if>
   <#if message.attachments?size gt 0>
   ,"imageUrl": "${message.attachments[0].proxyUrl}"
-  </#if>
-  <#if message.attachments?size = 0 && message.embeds?size gt 0>
+  <#elseif message.attachments?size = 0 && message.embeds?size gt 0 && message.embeds[0].cachedThumbnail??>
   ,"imageUrl": "${message.embeds[0].cachedThumbnail.proxyUrl}"
+  <#elseif message.attachments?size = 0 && message.embeds?size gt 0 && message.embeds[0].cachedImageInfo??>
+  ,"imageUrl": "${message.embeds[0].cachedImageInfo.proxyUrl}"
   </#if>
   ,"fields": [
     {