diff --git a/lib/Autocomplete.js b/lib/Autocomplete.js
index fd25a96d..cd6bdb71 100644
--- a/lib/Autocomplete.js
+++ b/lib/Autocomplete.js
@@ -120,10 +120,12 @@ let Autocomplete = React.createClass({
   keyDownHandlers: {
     ArrowDown (event) {
       event.preventDefault()
+      const itemsLength = this.getFilteredItems().length
+      if (!itemsLength) return
       var { highlightedIndex } = this.state
       var index = (
         highlightedIndex === null ||
-        highlightedIndex === this.getFilteredItems().length - 1
+        highlightedIndex === itemsLength - 1
       ) ?  0 : highlightedIndex + 1
       this._performAutoCompleteOnKeyUp = true
       this.setState({
@@ -134,11 +136,13 @@ let Autocomplete = React.createClass({
 
     ArrowUp (event) {
       event.preventDefault()
+      const itemsLength = this.getFilteredItems().length
+      if (!itemsLength) return
       var { highlightedIndex } = this.state
       var index = (
         highlightedIndex === 0 ||
         highlightedIndex === null
-      ) ? this.getFilteredItems().length - 1 : highlightedIndex - 1
+      ) ? itemsLength - 1 : highlightedIndex - 1
       this._performAutoCompleteOnKeyUp = true
       this.setState({
         highlightedIndex: index,