diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php
index 8ed42df1..0f8aad9b 100644
--- a/library/Director/Objects/IcingaObject.php
+++ b/library/Director/Objects/IcingaObject.php
@@ -102,10 +102,6 @@ abstract class IcingaObject extends DbObject
             }
         }
 
-        if ($this->supportsCustomVars()) {
-            $out .= $this->vars()->toConfigString();
-        }
-
         return $out;
     }
 
@@ -125,10 +121,10 @@ abstract class IcingaObject extends DbObject
     protected function renderCustomVars()
     {
         if ($this->supportsCustomVars()) {
-            // TODO
+            return $this->vars()->toConfigString();
+        } else {
+            return '';
         }
-
-        return '';
     }
 
     protected function renderCommandProperty($commandId, $propertyName = 'check_command')