diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index c474bd6b3..9de6d2356 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -8,6 +8,7 @@
 * [#6104](https://github.com/netbox-community/netbox/issues/6104) - Fix location column on racks table
 * [#6105](https://github.com/netbox-community/netbox/issues/6105) - Hide checkboxes for VMs under cluster VMs view
 * [#6106](https://github.com/netbox-community/netbox/issues/6106) - Allow assigning a virtual interface as the parent of an existing interface
+* [#6107](https://github.com/netbox-community/netbox/issues/6107) - Fix rack selection field on device form
 
 ---
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 5e322b340..9437225de 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2056,7 +2056,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         required=False,
         query_params={
             'site_id': '$site',
-            'location_id': 'location',
+            'location_id': '$location',
         }
     )
     position = forms.IntegerField(