diff --git a/machines/templatetags/bootstrap_form_typeahead.py b/machines/templatetags/bootstrap_form_typeahead.py
index ac22185e..32eb3818 100644
--- a/machines/templatetags/bootstrap_form_typeahead.py
+++ b/machines/templatetags/bootstrap_form_typeahead.py
@@ -169,7 +169,7 @@ def typeahead_datasets( f_name ) :
                 'if (q === "") {'                                             \
                     'var nb = 10;'                                            \
                     'var first = [] ;'                                        \
-                    'for ( var i = 0 ; i < nb ; i++ ) {'                      \
+                    'for ( var i=0 ; i<nb && i<choices.length; i++ ) {'       \
                         'first.push(choices[i].value);'                       \
                     '}'                                                       \
                     'sync(engine.get(first));'                                \