diff --git a/packages/react-bootstrap-table2/src/body.js b/packages/react-bootstrap-table2/src/body.js
index f176bbf80..e5d1626e1 100644
--- a/packages/react-bootstrap-table2/src/body.js
+++ b/packages/react-bootstrap-table2/src/body.js
@@ -87,27 +87,29 @@ class Body extends React.Component {
         additionalRowProps.selectRow = selectRow;
       }
 
-      content = data.map((row, index) => {
-        const key = _.get(row, keyField);
-        const baseRowProps = {
-          key,
-          row,
-          tabIndexCell,
-          columns,
-          keyField,
-          cellEdit,
-          value: key,
-          rowIndex: index,
-          visibleColumnSize,
-          attrs: rowEvents || {},
-          ...additionalRowProps
-        };
-
-        baseRowProps.style = _.isFunction(rowStyle) ? rowStyle(row, index) : rowStyle;
-        baseRowProps.className = (_.isFunction(rowClasses) ? rowClasses(row, index) : rowClasses);
-
-        return <this.RowComponent { ...baseRowProps } />;
-      });
+      content = data
+        .filter(row => row)
+        .map((row, index) => {
+          const key = _.get(row, keyField);
+          const baseRowProps = {
+            key,
+            row,
+            tabIndexCell,
+            columns,
+            keyField,
+            cellEdit,
+            value: key,
+            rowIndex: index,
+            visibleColumnSize,
+            attrs: rowEvents || {},
+            ...additionalRowProps
+          };
+
+          baseRowProps.style = _.isFunction(rowStyle) ? rowStyle(row, index) : rowStyle;
+          baseRowProps.className = (_.isFunction(rowClasses) ? rowClasses(row, index) : rowClasses);
+
+          return <this.RowComponent { ...baseRowProps } />;
+        });
     }
 
     return (