diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
index 10c9af56e..fa61fff08 100644
--- a/xCAT-server/lib/xcat/plugins/ddns.pm
+++ b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -25,6 +25,12 @@ if ( $distro =~ /ubuntu.*/ ){
 
 sub handled_commands
 {
+    my $sitetab = xCAT::Table->new('site');
+    my $stab = $sitetab->getAttribs({key=>'dnshandler'},['value']);
+    unless ($stab and $stab->{value}) {
+        return {"makedns" => "ddns"};
+    }
+
     return {"makedns" => "site:dnshandler"};
 }
 sub getzonesfornet {