diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py
index d465f214c..219e1f6c3 100644
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -439,21 +439,11 @@ class DeviceForm(TenancyForm, NetBoxModelForm):
         label=_('Device role'),
         queryset=DeviceRole.objects.all()
     )
-    manufacturer = DynamicModelChoiceField(
-        label=_('Manufacturer'),
-        queryset=Manufacturer.objects.all(),
-        required=False,
-        initial_params={
-            'platforms': '$platform'
-        }
-    )
     platform = DynamicModelChoiceField(
         label=_('Platform'),
         queryset=Platform.objects.all(),
         required=False,
-        query_params={
-            "manufacturer_id": '$manufacturer'
-        }
+        selector=True
     )
     cluster = DynamicModelChoiceField(
         label=_('Cluster'),
diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py
index 3c03bc96a..698d9dc70 100644
--- a/netbox/virtualization/forms/model_forms.py
+++ b/netbox/virtualization/forms/model_forms.py
@@ -197,21 +197,11 @@ class VirtualMachineForm(TenancyForm, NetBoxModelForm):
             "vm_role": "True"
         }
     )
-    manufacturer = DynamicModelChoiceField(
-        label=_('Manufacturer'),
-        queryset=Manufacturer.objects.all(),
-        required=False,
-        initial_params={
-            'platforms': '$platform'
-        }
-    )
     platform = DynamicModelChoiceField(
         label=_('Platform'),
         queryset=Platform.objects.all(),
         required=False,
-        query_params={
-            "manufacturer_id": '$manufacturer'
-        }
+        selector=True
     )
     local_context_data = JSONField(
         required=False,