diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
index e41ade45e..f6299cfbb 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/image-attachments.xsl
@@ -158,6 +158,11 @@
                 <xsl:with-param name="alt"
                                 tunnel="yes">
                     <xsl:choose>
+                        <xsl:when test="./caption = '   ' 
+                                        or ./caption=' ' 
+                                        or ./caption='.'">
+                            <xsl:value-of select="''"/>
+                        </xsl:when>
                         <xsl:when test="string-length(./caption) &gt; 0">
                             <xsl:value-of select="./caption"/>
                         </xsl:when>
@@ -169,6 +174,11 @@
                 <xsl:with-param name="title"
                                 tunnel="yes">
                     <xsl:choose>
+                        <xsl:when test="./caption = '   ' 
+                                        or ./caption=' ' 
+                                        or ./caption='.'">
+                            <xsl:value-of select="''"/>
+                        </xsl:when>
                         <xsl:when test="string-length(./caption) &gt; 0">
                             <xsl:value-of select="./caption"/>
                         </xsl:when>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 6cf3ddbe5..2f032fa09 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -892,13 +892,19 @@
         <xsl:param name="id" select="''"/>
         <xsl:param name="class" select="''"/>
         
-        <figcaption>
-            <xsl:call-template name="foundry:process-layouttree-attributes">
-                <xsl:with-param name="id" select="$id"/>
-                <xsl:with-param name="class" select="$class"/>
-            </xsl:call-template>
+        <xsl:variable name="caption-content">
             <xsl:apply-templates/>
-        </figcaption>
+        </xsl:variable>
+        
+        <xsl:if test="normalize-space($caption-content)">
+            <figcaption>
+                <xsl:call-template name="foundry:process-layouttree-attributes">
+                    <xsl:with-param name="id" select="$id"/>
+                    <xsl:with-param name="class" select="$class"/>
+                </xsl:call-template>
+                <xsl:apply-templates/>
+            </figcaption>
+        </xsl:if>
     </xsl:template>
     
     <xsl:template match="figure">