diff --git a/src/c3nav/mapdata/models/update.py b/src/c3nav/mapdata/models/update.py
index 097e8108..a0d4dcf4 100644
--- a/src/c3nav/mapdata/models/update.py
+++ b/src/c3nav/mapdata/models/update.py
@@ -95,7 +95,12 @@ class MapUpdate(models.Model):
     @contextmanager
     def lock(cls):
         with transaction.atomic():
-            yield cls.objects.select_for_update().get(pk=cls.objects.earliest().pk)
+            try:
+                earliest = cls.objects.earliest()
+            except cls.DoesNotExist:
+                yield
+            else:
+                yield cls.objects.select_for_update().get(pk=earliest.pk)
 
     def _changed_geometries_filename(self):
         return os.path.join(settings.CACHE_ROOT, 'changed_geometries', 'update_%d.pickle' % self.pk)