diff --git a/src/Nav.js b/src/Nav.js
index 8f46a91d..9aa6123e 100644
--- a/src/Nav.js
+++ b/src/Nav.js
@@ -157,7 +157,8 @@ class Nav extends React.Component {
 
   getNextActiveChild(offset) {
     const { children } = this.props;
-    const validChildren = children.filter(
+    const validChildren = ValidComponentChildren.filter(
+      children,
       child => child.props.eventKey != null && !child.props.disabled
     );
     const { activeKey, activeHref } = this.getActiveProps();
diff --git a/test/NavSpec.js b/test/NavSpec.js
index 46a192df..341655a5 100644
--- a/test/NavSpec.js
+++ b/test/NavSpec.js
@@ -168,6 +168,7 @@ describe('<Nav>', () => {
             NavItem 4 content
           </NavItem>
           <NavItem eventKey={5}>NavItem 5 content</NavItem>
+          {false && <NavItem eventKey={6}>NavItem 6 content</NavItem>}
         </Nav>,
         { attachTo: mountPoint }
       );