diff --git a/components/autocomplete/Autocomplete.js b/components/autocomplete/Autocomplete.js
index 6bf96957..3401f947 100644
--- a/components/autocomplete/Autocomplete.js
+++ b/components/autocomplete/Autocomplete.js
@@ -154,8 +154,13 @@ const factory = (Chip, Input) => {
    }
 
    query (key) {
-     return !this.props.multiple && key ? this.source().get(key) : '';
-   }
+      var query_value = '';
+      if(!this.props.multiple && key) {
+        var source_value = this.source().get(key)
+        query_value = source_value ? source_value : key;
+      }
+      return query_value;
+    }
 
    suggestions () {
      let suggest = new Map();
diff --git a/lib/autocomplete/Autocomplete.js b/lib/autocomplete/Autocomplete.js
index af7a0d06..9311d9ab 100644
--- a/lib/autocomplete/Autocomplete.js
+++ b/lib/autocomplete/Autocomplete.js
@@ -165,8 +165,13 @@ var factory = function factory(Chip, Input) {
     }, {
       key: 'query',
       value: function query(key) {
-        return !this.props.multiple && key ? this.source().get(key) : '';
+      var query_value = '';
+      if(!this.props.multiple && key) {
+        var source_value = this.source().get(key)
+        query_value = source_value ? source_value : key;
       }
+      return query_value;
+    }
     }, {
       key: 'suggestions',
       value: function suggestions() {
@@ -474,4 +479,4 @@ var factory = function factory(Chip, Input) {
 var Autocomplete = factory(_Chip2.default, _Input2.default);
 exports.default = (0, _reactCssThemr.themr)(_identifiers.AUTOCOMPLETE)(Autocomplete);
 exports.autocompleteFactory = factory;
-exports.Autocomplete = Autocomplete;
\ No newline at end of file
+exports.Autocomplete = Autocomplete;