diff --git a/library/Director/Objects/IcingaZone.php b/library/Director/Objects/IcingaZone.php
index 05942c39..19b7ce27 100644
--- a/library/Director/Objects/IcingaZone.php
+++ b/library/Director/Objects/IcingaZone.php
@@ -48,7 +48,7 @@ class IcingaZone extends IcingaObject
     // TODO: Move this away, should be prefetchable:
     protected function listEndpoints()
     {
-        if ($this->endpointList === null) {
+        if ($this->id && $this->endpointList === null) {
             $db = $this->getDb();
             $query = $db->select()
                 ->from('icinga_endpoint', 'object_name')