diff --git a/library/Director/CustomVariable/CustomVariables.php b/library/Director/CustomVariable/CustomVariables.php
index 3424f51a..0223564f 100644
--- a/library/Director/CustomVariable/CustomVariables.php
+++ b/library/Director/CustomVariable/CustomVariables.php
@@ -22,7 +22,14 @@ class CustomVariables implements Iterator, Countable, IcingaConfigRenderer
 
     public function count()
     {
-        return count($this->vars);
+        $count = 0;
+        foreach ($this->vars as $var) {
+            if (! $var->hasBeenDeleted()) {
+                $count++;
+            }
+        }
+
+        return $count;
     }
 
     public function rewind()