diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index fc18e212c..ca0d13f21 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1445,7 +1445,7 @@ class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
         label='Interface',
         widget=APISelect(
             api_url='/api/dcim/interfaces/?device_id={{device_b}}&type=physical',
-            disabled_indicator='is_connected'
+            disabled_indicator='connection'
         )
     )
 
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 8afe8b58e..dcf43d090 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -443,12 +443,10 @@ class ChainedFieldsMixin(forms.BaseForm):
 
                 filters_dict = {}
                 for db_field, parent_field in field.chains.items():
-                    if self.is_bound:
-                        filters_dict[db_field] = self.data.get(parent_field) or None
+                    if self.is_bound and self.data.get(parent_field):
+                        filters_dict[db_field] = self.data[parent_field]
                     elif self.initial.get(parent_field):
                         filters_dict[db_field] = self.initial[parent_field]
-                    else:
-                        filters_dict[db_field] = None
 
                 if filters_dict:
                     field.queryset = field.queryset.filter(**filters_dict)