diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 030de3436..3300b1054 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -337,9 +337,9 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
     objects = RackManager()
 
     class Meta:
-        ordering = ['site', 'name']
+        ordering = ['site', 'name', 'group']
         unique_together = [
-            ['site', 'name'],
+            ['site', 'name', 'group'],
             ['site', 'facility_id'],
         ]