diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm
index 393b9dffd..04fbee44a 100644
--- a/xCAT-server/lib/xcat/plugins/nodediscover.pm
+++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm
@@ -283,7 +283,7 @@ sub process_request {
           unless ($firstmac) {
               $firstmac = $mac;
           }
-          if ($host eq $node) {
+          if (!$host || $host eq $node) {
               $firstmac = $mac;
               last;
           }