diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index 17ae6c907..6aa0e3552 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -61,7 +61,7 @@ def get_custom_fields_for_model(content_type, filterable_only=False, bulk_edit=F
 
         # Select
         elif cf.type == CustomFieldTypeChoices.TYPE_SELECT:
-            choices = [(cfc.pk, cfc) for cfc in cf.choices.all()]
+            choices = [(cfc.pk, cfc.value) for cfc in cf.choices.all()]
             if not cf.required or bulk_edit or filterable_only:
                 choices = [(None, '---------')] + choices
             # Check for a default choice
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 19a26b3c9..c4b3bb6ea 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -149,9 +149,6 @@ def example_choices(field, arg=3):
             break
         if not value or not label:
             continue
-        # Handling for custom fields
-        if hasattr(label, 'value'):
-            label = label.value
         examples.append(label)
     return ', '.join(examples) or 'None'