diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 36aa98a8d3e..10b999dd441 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1934,6 +1934,11 @@ def __init__(self, *args, **kwargs):
                 device = Device.objects.get(pk=self.initial.get('device'))
             except Device.DoesNotExist:
                 pass
+        else:
+            try:
+                device = Device.objects.get(pk=self.data.get('device'))
+            except Device.DoesNotExist:
+                pass
         if device is not None:
             interface_ordering = device.device_type.interface_ordering
             self.fields['lag'].queryset = Interface.objects.order_naturally(method=interface_ordering).filter(
@@ -1950,10 +1955,16 @@ def __init__(self, *args, **kwargs):
             self.fields['site'].queryset = Site.objects.none()
             self.fields['site'].initial = None
 
-        filter_dict = {
-            'group_id': None,
-            'site_id': None,
-        }
+        if self.is_bound:
+            filter_dict = {
+                'group_id': self.data.get('vlan_group') or None,
+                'site_id': self.data.get('site') or None,
+            }
+        else:
+            filter_dict = {
+                'group_id': None,
+                'site_id': None,
+            }
 
         self.fields['untagged_vlan'].queryset = VLAN.objects.filter(**filter_dict)
         self.fields['tagged_vlans'].queryset = VLAN.objects.filter(**filter_dict)
@@ -2324,4 +2335,4 @@ def clean_vc_position(self):
         if Device.objects.filter(virtual_chassis=self.instance.virtual_chassis, vc_position=vc_position).exists():
             raise forms.ValidationError("A virtual chassis member already exists in this position.")
 
-        return vc_position
\ No newline at end of file
+        return vc_position