diff --git a/components/autocomplete/Autocomplete.js b/components/autocomplete/Autocomplete.js
index 53ff427d..94090298 100644
--- a/components/autocomplete/Autocomplete.js
+++ b/components/autocomplete/Autocomplete.js
@@ -412,7 +412,11 @@ const factory = (Chip, Input) => {
             onKeyUp={this.handleQueryKeyUp}
             theme={theme}
             themeNamespace="input"
-            value={this.state.query == null ? (this.props.multiple || !this.props.value ? '' : this.source().get(''+this.props.value)) : this.state.query}
+            value={this.state.query == null
+              ? (this.props.multiple || this.props.value == null
+                ? ''
+                : this.source().get(''+this.props.value))
+              : this.state.query}
           />
           <Portal>
             {this.state.focus ? this.renderSuggestionList() : null}
diff --git a/package.json b/package.json
index 76e7106f..2aa8e32b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "react-toolbox",
   "description": "A set of React components implementing Google's Material Design specification with the power of CSS Modules.",
   "homepage": "http://www.react-toolbox.io",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.15",
   "main": "./lib",
   "module": "./components",
   "author": {