diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 301796b0a..291a9b370 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2457,10 +2457,11 @@ sub addnet
             {
                 $tftp = $ent->{tftpserver};
             }
-            else
-            {    #presume myself to be it, dhcp no longer does this for us
+            if (!$tftp || ($tftp eq '<xcatmaster>'))
+            {
                 $tftp = $myip;
             }
+
             if ($ent and $ent->{gateway})
             {
                 $gateway = $ent->{gateway};