diff --git a/src/stylesheets/tei2eoatex.xsl b/src/stylesheets/tei2eoatex.xsl
index 4347fbe..b1279fa 100644
--- a/src/stylesheets/tei2eoatex.xsl
+++ b/src/stylesheets/tei2eoatex.xsl
@@ -12,6 +12,7 @@
   <xsl:param name="contributors" as="xs:boolean" required="no" select="false()"/>
   <xsl:param name="contributorsmanual" as="xs:boolean" required="no" select="false()"/>
   <xsl:param name="strictfloats" as="xs:boolean" required="no" select="false()"/>
+  <xsl:param name="indentafterfloats" as="xs:boolean" required="no" select="false()"/>
   <xsl:param name="extranewpage" as="xs:boolean" required="no" select="false()"/>
   <xsl:param name="manualpreambel" as="xs:boolean" required="no" select="false()"/>
   <xsl:param name="hyphenation" as="xs:boolean" required="no" select="false()"/>
diff --git a/src/stylesheets/tei2eoatex/eoatex_textparts.xsl b/src/stylesheets/tei2eoatex/eoatex_textparts.xsl
index 79adf62..82d9070 100644
--- a/src/stylesheets/tei2eoatex/eoatex_textparts.xsl
+++ b/src/stylesheets/tei2eoatex/eoatex_textparts.xsl
@@ -187,13 +187,23 @@
   <xsl:template match="tei:body//tei:p[not(ancestor::tei:note) and not(parent::tei:div[@type = 'letter']) and not(parent::tei:epigraph)]">
     <xsl:call-template name="begin_paragraph"/>
     <xsl:if test="
-      preceding-sibling::*[1][self::tei:figure[not(@type='hionly*')]]
-      or preceding-sibling::*[1][self::tei:ab[@type = 'chapterabstract']]
+      preceding-sibling::*[1][self::tei:ab[@type = 'chapterabstract']]
       or preceding-sibling::*[1][self::tei:quote | self::tei:list]
       or preceding-sibling::*[1][self::tei:milestone[@type = 'divider']]
     ">
       <xsl:text>\noindent </xsl:text>
     </xsl:if>
+    <xsl:if test="preceding-sibling::*[1][self::tei:figure[not(@type='hionly*')]]">
+      <xsl:choose>
+        <xsl:when test="$indentafterfloats">
+          <xsl:value-of select="eoa:texcomment('Not disabling indent after float.')" />
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>\noindent </xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+
     <xsl:apply-templates />
     <xsl:text>&#x000a;</xsl:text>
   </xsl:template>