diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js b/app/assets/javascripts/discourse/lib/autocomplete.js
index 59adb766e7c..9057afe0482 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js
@@ -282,7 +282,7 @@ $.fn.autocomplete = function(options) {
           inputSelectedItems.push("");
         }
 
-        if(_.isString(inputSelectedItems[0])) {
+        if(_.isString(inputSelectedItems[0]) && me.val().length > 0) {
           inputSelectedItems.pop();
           inputSelectedItems.push(me.val());
           if (options.onChangeItems) {