diff --git a/netbox/utilities/forms/fields/dynamic.py b/netbox/utilities/forms/fields/dynamic.py index 94870451d..aef7cb6e5 100644 --- a/netbox/utilities/forms/fields/dynamic.py +++ b/netbox/utilities/forms/fields/dynamic.py @@ -40,11 +40,12 @@ class DynamicMultipleChoiceField(forms.MultipleChoiceField): def get_bound_field(self, form, field_name): bound_field = BoundField(form, self, field_name) data = bound_field.value() - if data is not None: self.choices = [ - choice for choice in self.choices if choice[0] in data + choice for choice in self.choices if choice[0] and choice[0] in data ] + else: + self.choices = [] return bound_field