diff --git a/docs/release-notes/version-3.6.md b/docs/release-notes/version-3.6.md
index e2fcb1afeee..8b14929d5ca 100644
--- a/docs/release-notes/version-3.6.md
+++ b/docs/release-notes/version-3.6.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#13351](https://github.com/netbox-community/netbox/issues/13351) - Fix missing text due to incorrectly applied translation tags
+* [#13361](https://github.com/netbox-community/netbox/issues/13361) - Extra choices field on custom field choice set form should not be required
 
 ---
 
diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py
index 0dc384867a9..47bde65f9f1 100644
--- a/netbox/extras/forms/model_forms.py
+++ b/netbox/extras/forms/model_forms.py
@@ -89,6 +89,11 @@ def __init__(self, *args, **kwargs):
 class CustomFieldChoiceSetForm(BootstrapMixin, forms.ModelForm):
     extra_choices = forms.CharField(
         widget=ChoicesWidget(),
+        required=False,
+        help_text=_(
+            'Enter one choice per line. An optional label may be specified for each choice by appending it with a '
+            'comma (for example, "choice1,First Choice").'
+        )
     )
 
     class Meta: