diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 9e88d7214..a0c38476d 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1396,6 +1396,7 @@ sub addnet6
     }
     my $ddnserver = $nameservers;
     $ddnserver =~ s/,.*//;
+    if ($::XCATSITEVALS{dnshandler} =~ /ddns/) {
     push @netent, "    zone $domain. {\n";
     push @netent, "       primary $ddnserver; key xcat_key; \n";
     push @netent, "    }\n";
@@ -1404,6 +1405,7 @@ sub addnet6
        push @netent, "       primary $ddnserver; key xcat_key; \n";
        push @netent, "    }\n";
     }
+    }
     if ($netcfgs{$net}->{range}) {
         push @netent,"    range6 ".$netcfgs{$net}->{range}.";\n";
     } else {
@@ -1610,6 +1612,7 @@ sub addnet
         }
         my $ddnserver = $nameservers;
         $ddnserver =~ s/,.*//;
+        if ($::XCATSITEVALS{dnshandler} =~ /ddns/) {
         push @netent, "zone $domain. {\n";
         push @netent, "   primary $ddnserver; key xcat_key; \n";
         push @netent, " }\n";
@@ -1618,6 +1621,7 @@ sub addnet
             push @netent, "   primary $ddnserver; key xcat_key; \n";
             push @netent, " }\n";
         }
+        }
 
         my $tmpmaskn = unpack("N", inet_aton($mask));
         my $maskbits = 32;