diff --git a/src/c3nav/mapdata/models/update.py b/src/c3nav/mapdata/models/update.py
index 65326c1d..a6f63d36 100644
--- a/src/c3nav/mapdata/models/update.py
+++ b/src/c3nav/mapdata/models/update.py
@@ -178,15 +178,15 @@ class MapUpdate(models.Model):
 
             logger.info('Rebuilding router...')
             from c3nav.routing.router import Router
-            Router.rebuild(new_updates[-1].to_tuple)
+            router = Router.rebuild(new_updates[-1].to_tuple)
 
             logger.info('Rebuilding locator...')
             from c3nav.routing.locator import Locator
-            Locator.rebuild(new_updates[-1].to_tuple)
+            locator = Locator.rebuild(new_updates[-1].to_tuple)
 
             logger.info('Rebuilding range locator...')
             from c3nav.routing.rangelocator import RangeLocator
-            RangeLocator.rebuild(new_updates[-1].to_tuple)
+            range_locator = RangeLocator.rebuild(new_updates[-1].to_tuple, router)
 
             for new_update in reversed(new_updates):
                 new_update.processed = True
diff --git a/src/c3nav/routing/rangelocator.py b/src/c3nav/routing/rangelocator.py
index e851ce11..43044324 100644
--- a/src/c3nav/routing/rangelocator.py
+++ b/src/c3nav/routing/rangelocator.py
@@ -23,9 +23,7 @@ class RangeLocator:
     beacon_lookup: dict[str: int]
 
     @classmethod
-    def rebuild(cls, update):
-        router = Router.load()
-
+    def rebuild(cls, update, router):
         beacons = RangingBeacon.objects.all()
 
         locator = cls(