diff --git a/docker/startup_scripts/110_devices.py b/docker/startup_scripts/110_devices.py
index 16c6f9ee6..584b5c255 100644
--- a/docker/startup_scripts/110_devices.py
+++ b/docker/startup_scripts/110_devices.py
@@ -26,7 +26,6 @@ with file.open('r') as stream:
   optional_assocs = {
     'tenant': (Tenant, 'name'),
     'platform': (Platform, 'name'),
-    'rack': (Rack, 'name'),
     'cluster': (Cluster, 'name'),
     'primary_ip4': (IPAddress, 'address'),
     'primary_ip6': (IPAddress, 'address')
@@ -49,6 +48,9 @@ with file.open('r') as stream:
 
           params[assoc] = model.objects.get(**query)
 
+      if 'rack' in params:
+        params['rack'] = Rack.objects.get(name=params.pop('rack'), site=params['site'].id)
+
       if 'face' in params:
         for rack_face in RACK_FACE_CHOICES:
           if params['face'] in rack_face: