diff --git a/library/Director/Web/Table/IcingaServiceSetServiceTable.php b/library/Director/Web/Table/IcingaServiceSetServiceTable.php
index 981cd538..0f0c4d54 100644
--- a/library/Director/Web/Table/IcingaServiceSetServiceTable.php
+++ b/library/Director/Web/Table/IcingaServiceSetServiceTable.php
@@ -199,11 +199,13 @@ class IcingaServiceSetServiceTable extends ZfQueryBasedTable
         assert($connection instanceof Db);
         $builder = new ServiceSetQueryBuilder($connection, $this->branchUuid);
         $query = $builder->selectServicesForSet($this->set);
+        $alias = $this->branchUuid ? 'u' : 'o';
+
         if ($this->affectedHost) {
             if ($hostId = $this->affectedHost->get('id')) {
                 $query->joinLeft(
                     ['hsb' => 'icinga_host_service_blacklist'],
-                    $this->db()->quoteInto('o.id = hsb.service_id AND hsb.host_id = ?', $hostId),
+                    $this->db()->quoteInto("$alias.id = hsb.service_id AND hsb.host_id = ?", $hostId),
                     []
                 )->columns([
                     'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END"