diff --git a/module/zanode/control.php b/module/zanode/control.php
index 54e35efa19..da6e028ffd 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -399,7 +399,7 @@ class zanode extends control
     {
         $node          = $this->zanode->getNodeById($hostID);
         $serviceStatus = $this->zanode->getServiceStatus($node);
-        if ($node->status != 'running')
+        if ($node->status != 'running' && $node->status != 'wait')
         {
             $serviceStatus['ZenAgent'] = "unknown";
             $serviceStatus['ZTF'] = "unknown";