Ticket #18829: 18829.diff

models.py

@@ -897 +897 @@
                 yield self.choice(obj)
 
     def __len__(self):
-        return len(self.queryset)
+        return len(self.queryset) + (self.field.empty_label is not None)
 
     def choice(self, obj):
         return (self.field.prepare_value(obj), self.field.label_from_instance(obj))