diff --git a/src/TableBody.js b/src/TableBody.js
index 6e0a94aad..034f64293 100644
--- a/src/TableBody.js
+++ b/src/TableBody.js
@@ -189,10 +189,12 @@ class TableBody extends Component {
     }, this);
 
     if (tableRows.length === 0 && !this.props.withoutNoDataText) {
+      const colSpan = this.props.columns.filter(c => !c.hidden).length
+        + (isSelectRowDefined ? 1 : 0);
       tableRows = [
         <TableRow key='##table-empty##'>
           <td data-toggle='collapse'
-              colSpan={ this.props.columns.length + (isSelectRowDefined ? 1 : 0) }
+              colSpan={ colSpan }
               className='react-bs-table-no-data'>
               { this.props.noDataText || Const.NO_DATA_TEXT }
           </td>