diff --git a/src/Geosuggest.jsx b/src/Geosuggest.jsx
index b805cc50..f0cb26e4 100644
--- a/src/Geosuggest.jsx
+++ b/src/Geosuggest.jsx
@@ -49,9 +49,7 @@ class Geosuggest extends React.Component {
    * Google api sdk object will be obtained and cached as a instance property.
    * Necessary objects of google api will also be determined and saved.
    */
-  componentDidMount() {
-    this.setState({userInput: this.props.initialValue});
-
+  componentWillMount() {
     var googleMaps = this.props.googleMaps ||
       (window.google && // eslint-disable-line no-extra-parens
         window.google.maps) ||