Ticket #13086: choices.diff

django/db/models/fields/__init__.py

@@ -387 +387 @@
         as SelectField choices for this field."""
         first_choice = include_blank and blank_choice or []
         if self.choices:
+            if first_choice and first_choice[0][0] in [c[0] for c in self.choices]:
+                return list(self.choices)
             return first_choice + list(self.choices)
         rel_model = self.rel.to
         if hasattr(self.rel, 'get_related_field'):