diff --git a/packages/react-bootstrap-table2/src/bootstrap-table.js b/packages/react-bootstrap-table2/src/bootstrap-table.js
index 53ee947..ea78c32 100644
--- a/packages/react-bootstrap-table2/src/bootstrap-table.js
+++ b/packages/react-bootstrap-table2/src/bootstrap-table.js
@@ -55,7 +55,8 @@ class BootstrapTable extends PropsBaseResolver(Component) {
       rowClasses,
       wrapperClasses,
       rowEvents,
-      selectRow
+      selectRow,
+      expandRow
     } = this.props;
 
     const tableWrapperClass = cs('react-bootstrap-table', wrapperClasses);
@@ -68,7 +69,6 @@ class BootstrapTable extends PropsBaseResolver(Component) {
     }, classes);
 
     const tableCaption = (caption && <Caption>{ caption }</Caption>);
-    const expandRow = this.resolveExpandRowProps();
 
     return (
       <div className={ tableWrapperClass }>
@@ -193,7 +193,8 @@ BootstrapTable.defaultProps = {
   },
   expandRow: {
     renderer: undefined,
-    expanded: []
+    expanded: [],
+    nonExpandable: []
   }
 };
 
diff --git a/packages/react-bootstrap-table2/src/props-resolver/expand-row-resolver.js b/packages/react-bootstrap-table2/src/props-resolver/expand-row-resolver.js
deleted file mode 100644
index 015e321..0000000
--- a/packages/react-bootstrap-table2/src/props-resolver/expand-row-resolver.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export default ExtendBase =>
-  class ExpandRowResolver extends ExtendBase {
-    resolveExpandRowProps() {
-      const { expandRow, expanded, onRowExpand, onAllRowExpand, isAnyExpands } = this.props;
-      if (expandRow) {
-        return {
-          ...expandRow,
-          expanded,
-          onRowExpand,
-          onAllRowExpand,
-          isAnyExpands,
-          nonExpandable: expandRow.nonExpandable || []
-        };
-      }
-      return null;
-    }
-  };
diff --git a/packages/react-bootstrap-table2/src/props-resolver/index.js b/packages/react-bootstrap-table2/src/props-resolver/index.js
index 105c3ea..0c3c92d 100644
--- a/packages/react-bootstrap-table2/src/props-resolver/index.js
+++ b/packages/react-bootstrap-table2/src/props-resolver/index.js
@@ -1,9 +1,7 @@
 import ColumnResolver from './column-resolver';
-import ExpandRowResolver from './expand-row-resolver';
 
 export default ExtendBase =>
-  class TableResolver extends
-    ExpandRowResolver(ColumnResolver(ExtendBase)) {
+  class TableResolver extends ColumnResolver(ExtendBase) {
     validateProps() {
       const { keyField } = this.props;
       if (!keyField) {