diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md
index 025994856..d7832a823 100644
--- a/docs/release-notes/version-2.6.md
+++ b/docs/release-notes/version-2.6.md
@@ -26,6 +26,7 @@
 * [#3864](https://github.com/netbox-community/netbox/issues/3864) - Disallow /0 masks
 * [#3872](https://github.com/netbox-community/netbox/issues/3872) - Paginate related IPs of an address
 * [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fixed min/max to ASN input field at the site creation page
+* [#3882](https://github.com/netbox-community/netbox/issues/3882) - Fix filtering of devices by rack group
 
 ---
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 6086491d0..f0b91c2f5 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -739,7 +739,7 @@ class RackElevationFilterForm(RackFilterForm):
 
         # Filter the rack field based on the site and group
         self.fields['site'].widget.add_filter_for('id', 'site')
-        self.fields['group_id'].widget.add_filter_for('id', 'group_id')
+        self.fields['rack_group_id'].widget.add_filter_for('id', 'group_id')
 
 
 #
@@ -1791,7 +1791,7 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
 class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldFilterForm):
     model = Device
     field_order = [
-        'q', 'region', 'site', 'group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant',
+        'q', 'region', 'site', 'rack_group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant',
         'manufacturer_id', 'device_type_id', 'mac_address', 'has_primary_ip',
     ]
     q = forms.CharField(
@@ -1817,12 +1817,12 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
             api_url="/api/dcim/sites/",
             value_field="slug",
             filter_for={
-                'group_id': 'site',
+                'rack_group_id': 'site',
                 'rack_id': 'site',
             }
         )
     )
-    group_id = FilterChoiceField(
+    rack_group_id = FilterChoiceField(
         queryset=RackGroup.objects.prefetch_related(
             'site'
         ),