diff --git a/src/typeahead/index.js b/src/typeahead/index.js
index c13d2dd0..9b900b21 100644
--- a/src/typeahead/index.js
+++ b/src/typeahead/index.js
@@ -285,7 +285,7 @@ var Typeahead = React.createClass({
 
   componentWillReceiveProps: function(nextProps) {
     this.setState({
-      visible: this.getOptionsForValue(this.state.entryValue, nextProps.options)
+      visible: this.getOptionsForValue(nextProps.entryValue, nextProps.options)
     });
   },