diff --git a/grobid-core/src/main/java/org/grobid/core/data/Figure.java b/grobid-core/src/main/java/org/grobid/core/data/Figure.java
index 7f9bbdc5b4..b764180128 100644
--- a/grobid-core/src/main/java/org/grobid/core/data/Figure.java
+++ b/grobid-core/src/main/java/org/grobid/core/data/Figure.java
@@ -385,7 +385,7 @@ public String toTEI(GrobidAnalysisConfig config, Document doc, TEIFormatter form
                 addXmlId(desc, "_" + divID);
             }
 
-            // if the segment has been parsed with the full text model we further extract the clusters
+            // if the segment has been parsed with the full-text model, we further extract the clusters
             // to get the bibliographical references
             if (StringUtils.isNotBlank(labeledCaption)) {
                 TaggingTokenClusteror clusteror = new TaggingTokenClusteror(GrobidModels.FULLTEXT, labeledCaption, captionLayoutTokens);
@@ -432,19 +432,17 @@ public String toTEI(GrobidAnalysisConfig config, Document doc, TEIFormatter form
 
             if (StringUtils.isNotBlank(desc.getValue()) && config.isWithSentenceSegmentation()) {
                 formatter.segmentIntoSentences(desc, this.captionLayoutTokens, config, doc.getLanguage(), doc.getPDFAnnotations());
+            }
 
-                // we need a sentence segmentation of the figure caption, for that we need to introduce 
-                // a <div>, then a <p>
-                desc.setLocalName("p");
+            desc.setLocalName("p");
 
-                Element div = XmlBuilderUtils.teiElement("div");
-                div.appendChild(desc);
+            Element div = XmlBuilderUtils.teiElement("div");
+            div.appendChild(desc);
 
-                Element figDesc = XmlBuilderUtils.teiElement("figDesc");                
-                figDesc.appendChild(div);
+            Element figDesc = XmlBuilderUtils.teiElement("figDesc");
+            figDesc.appendChild(div);
 
-                desc = figDesc;
-            }
+            desc = figDesc;
 
             figureElement.appendChild(desc);
         }
diff --git a/grobid-core/src/main/java/org/grobid/core/data/Table.java b/grobid-core/src/main/java/org/grobid/core/data/Table.java
index 9cfdaebe62..c808715750 100644
--- a/grobid-core/src/main/java/org/grobid/core/data/Table.java
+++ b/grobid-core/src/main/java/org/grobid/core/data/Table.java
@@ -150,19 +150,16 @@ public String toTEI(GrobidAnalysisConfig config, Document doc, TEIFormatter form
 
                     if (StringUtils.isNotBlank(desc.getValue()) && config.isWithSentenceSegmentation()) {
                         formatter.segmentIntoSentences(desc, this.captionLayoutTokens, config, doc.getLanguage(), doc.getPDFAnnotations());
+                    }
+                    desc.setLocalName("p");
 
-                        // we need a sentence segmentation of the table caption, for that we need to introduce 
-                        // a <div>, then a <p>
-                        desc.setLocalName("p");
-
-                        Element div = XmlBuilderUtils.teiElement("div");
-                        div.appendChild(desc);
+                    Element div = XmlBuilderUtils.teiElement("div");
+                    div.appendChild(desc);
 
-                        Element figDesc = XmlBuilderUtils.teiElement("figDesc");                
-                        figDesc.appendChild(div);
+                    Element figDesc = XmlBuilderUtils.teiElement("figDesc");
+                    figDesc.appendChild(div);
 
-                        desc = figDesc;
-                    }
+                    desc = figDesc;
                 }
             } else {
                 desc.appendChild(LayoutTokensUtil.normalizeText(caption.toString()).trim());