diff --git a/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl b/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl
index bcc77faa..1ebb0aad 100644
--- a/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl
+++ b/abstracto-modules/link-embed/src/main/resources/default/listener/message_embed_embed.ftl
@@ -37,7 +37,7 @@
             </#if>
             <#list embeddedMessage.embeds as embed>
                 <#if embed.description?has_content>
-                 <#if embeddedMessage.content?has_content>,</#if>
+                 <#if hasContent>,</#if>
                     <#if (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content)>
                         {
                         <#assign hasContent=true>
@@ -62,6 +62,7 @@
                     <#assign hasContent=true>
                 <#elseif (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
                 || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
+                    <#if hasContent>,</#if>
                     <#assign hasContent=true>
                 {
                     "type": "mediaGallery",
diff --git a/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl b/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl
index a46ddd46..181e879e 100644
--- a/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl
+++ b/abstracto-modules/starboard/src/main/resources/default/listener/starboard_post_embed.ftl
@@ -46,13 +46,15 @@
                 </#if>
             <#list message.embeds as embed>
                 <#if embed.description?has_content && !((embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content) || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content))>
+                    <#if hasContent>,</#if>
                     <#assign hasContent=true>
-                    <#if message.content?has_content>,</#if>{
+                    {
                         "type": "textDisplay",
                         "content": "${embed.description?json_string}"
                     }
                 <#elseif embed.description?has_content && (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
                 || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
+                <#if hasContent>,</#if>
                 <#assign hasContent=true>
                 ,{
                     "type": "section",
@@ -69,6 +71,7 @@
                 }
                 <#elseif (embed.cachedImageInfo?has_content && embed.cachedImageInfo.proxyUrl?has_content && embed.cachedImageInfo.width gt 0)
                 || (embed.cachedThumbnail?has_content && embed.cachedThumbnail.proxyUrl?has_content && embed.cachedThumbnail.width gt 0)>
+                    <#if hasContent>,</#if>
                     <#assign hasContent=true>
                 {
                     "type": "mediaGallery",