diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index ec9545ef3..2fa12f448 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -250,7 +250,8 @@ protected function loadObject()
         }
 
         $key = $this->getLegacyKey();
-        $uuid = UuidLookup::findServiceUuid($this->db(), $this->getBranch(), 'object', $key, $this->host, $this->set);
+        // Hint: not passing 'object' as type, we still have name-based links in previews and similar
+        $uuid = UuidLookup::findServiceUuid($this->db(), $this->getBranch(), null, $key, $this->host, $this->set);
         $this->params->set('uuid', $uuid->toString());
         parent::loadObject();
     }