diff --git a/src/client/components/facet_results/ResultTable.js b/src/client/components/facet_results/ResultTable.js
index 7e02fb1f045bff832d948a080d29f870e72cde97..2092fce958e1251eedcd0f395409cced91d799c8 100644
--- a/src/client/components/facet_results/ResultTable.js
+++ b/src/client/components/facet_results/ResultTable.js
@@ -189,7 +189,7 @@ class ResultTable extends React.Component {
       ? true
       : this.state.expandedRows.has(row.id)
     let hasExpandableContent = false
-    let renderExpandButton = hasExpandableContent
+    let renderExpandButton
     const dataCells = this.props.data.properties.map(column => {
       const {
         id, valueType, makeLink, externalLink, sortValues, sortBy, numberedList, minWidth,
@@ -222,9 +222,9 @@ class ResultTable extends React.Component {
           shortenLabel = !expanded // shorten label only if the cell is not expanded
         }
       }
-      if (data.paginatedResultsAlwaysExpandRows) {
-        renderExpandButton = false
-      }
+      renderExpandButton = data.paginatedResultsAlwaysExpandRows
+        ? false
+        : hasExpandableContent
       return (
         <ResultTableCell
           key={id}