diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index edd73b87e..28d3a143b 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -632,8 +632,8 @@ class InterfaceSerializer(PrimaryModelSerializer, CableTerminationSerializer, Co
     parent = NestedInterfaceSerializer(required=False, allow_null=True)
     lag = NestedInterfaceSerializer(required=False, allow_null=True)
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
-    rf_channel = ChoiceField(choices=WirelessChannelChoices)
-    rf_channel_width = ChoiceField(choices=WirelessChannelWidthChoices)
+    rf_channel = ChoiceField(choices=WirelessChannelChoices, required=False)
+    rf_channel_width = ChoiceField(choices=WirelessChannelWidthChoices, required=False, allow_null=True)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
     tagged_vlans = SerializedPKRelatedField(
         queryset=VLAN.objects.all(),
diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py
index be10556be..55f1ba150 100644
--- a/netbox/dcim/graphql/types.py
+++ b/netbox/dcim/graphql/types.py
@@ -206,6 +206,9 @@ class InterfaceType(IPAddressesMixin, ComponentObjectType):
     def resolve_mode(self, info):
         return self.mode or None
 
+    def resolve_rf_channel(self, info):
+        return self.rf_channel or None
+
 
 class InterfaceTemplateType(ComponentTemplateObjectType):
 
diff --git a/netbox/wireless/api/serializers.py b/netbox/wireless/api/serializers.py
index 90515f53e..9337d6864 100644
--- a/netbox/wireless/api/serializers.py
+++ b/netbox/wireless/api/serializers.py
@@ -29,7 +29,7 @@ class WirelessLinkSerializer(PrimaryModelSerializer):
     interface_b = NestedInterfaceSerializer()
 
     class Meta:
-        model = WirelessLAN
+        model = WirelessLink
         fields = [
             'id', 'url', 'display', 'interface_a', 'interface_b', 'ssid', 'description',
         ]
diff --git a/netbox/wireless/graphql/types.py b/netbox/wireless/graphql/types.py
index 4cdb75ebe..0afd8e69a 100644
--- a/netbox/wireless/graphql/types.py
+++ b/netbox/wireless/graphql/types.py
@@ -3,6 +3,7 @@ from netbox.graphql.types import ObjectType
 
 __all__ = (
     'WirelessLANType',
+    'WirelessLinkType',
 )
 
 
@@ -12,3 +13,11 @@ class WirelessLANType(ObjectType):
         model = models.WirelessLAN
         fields = '__all__'
         filterset_class = filtersets.WirelessLANFilterSet
+
+
+class WirelessLinkType(ObjectType):
+
+    class Meta:
+        model = models.WirelessLink
+        fields = '__all__'
+        filterset_class = filtersets.WirelessLinkFilterSet