diff --git a/packages/react-bootstrap-table2/src/row-expand/expand-cell.js b/packages/react-bootstrap-table2/src/row-expand/expand-cell.js
index 4e42c48..b12ceee 100644
--- a/packages/react-bootstrap-table2/src/row-expand/expand-cell.js
+++ b/packages/react-bootstrap-table2/src/row-expand/expand-cell.js
@@ -41,7 +41,7 @@ export default class ExpandCell extends Component {
   render() {
     const { expanded, nonExpandable, expandColumnRenderer, tabIndex } = this.props;
     const attrs = {};
-    const isExpandable = !nonExpandable.includes(this.props.rowKey);
+    const isExpandable = !nonExpandable || !nonExpandable.includes(this.props.rowKey);
     if (tabIndex !== -1) attrs.tabIndex = tabIndex;
 
     return (