diff --git a/src/model.js b/src/model.js
index 44305b41c6..0adc134a77 100644
--- a/src/model.js
+++ b/src/model.js
@@ -750,7 +750,8 @@
             }
             for (var fname in this.model.fields) {
                 var field = this.model.fields[fname];
-                if (field.description.autocomplete) {
+                if (field.description.autocomplete &&
+                        field.description.autocomplete.length > 0) {
                     promises.push(this.do_autocomplete(fname));
                 }
             }