diff --git a/application/forms/IcingaServiceForm.php b/application/forms/IcingaServiceForm.php
index c7dfb8f4..519adaeb 100644
--- a/application/forms/IcingaServiceForm.php
+++ b/application/forms/IcingaServiceForm.php
@@ -713,7 +713,7 @@ class IcingaServiceForm extends DirectorObjectForm
             $table->setBranchUuid($this->branch->getUuid());
         }
         $result = [];
-        foreach ($db->fetchAll($table->getQuery()) as $row) {
+        foreach ($db->fetchAll($table->getQuery()->reset(\Zend_Db_Select::LIMIT_COUNT)) as $row) {
             $result[$row->object_name] = $row->object_name;
         }
 
diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 53d2bd90..245a1077 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -13,6 +13,7 @@ next (will be 1.9.1)
 
 ### User Interface
 * FIX: DataList-backed fields failed to validate (#2475)
+* FIX: No Host list limit when adding a single service globally (#2481)
 
 ### DB Schema
 * FIX: applying DB Schema migrations failed on PostgreSQL (#2482)