diff --git a/library/Director/Objects/IcingaHost.php b/library/Director/Objects/IcingaHost.php
index e8cd776a..65837de8 100644
--- a/library/Director/Objects/IcingaHost.php
+++ b/library/Director/Objects/IcingaHost.php
@@ -159,7 +159,12 @@ class IcingaHost extends IcingaObject
     public function renderToConfig(IcingaConfig $config)
     {
         parent::renderToConfig($config);
-        $this->renderAgentZoneAndEndpoint($config);
+
+        // TODO: We might alternatively let the whole config fail in case we have
+        //       used use_agent together with a legacy config
+        if (! $config->isLegacy()) {
+            $this->renderAgentZoneAndEndpoint($config);
+        }
     }
 
     public function renderAgentZoneAndEndpoint(IcingaConfig $config = null)