diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index 34fd4ea07..642724cf4 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -408,10 +408,6 @@ sub plugin_command {
        $req->{emptynoderange} = [1];
     }
 
-    if(@nodes == 0 ) {
-        print "No nodes or noderanges specified\n";
-        return 1;
-     }
   }
   if (@nodes) { $req->{node} = \@nodes; }
   my %unhandled_nodes;
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 172825314..62627ad77 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1010,16 +1010,6 @@ sub plugin_command {
     unless (@nodes) {
        $req->{emptynoderange} = [1];
     }
-   
-    if(@nodes == 0) {
-        my $rsp = {errorcode=>1,error=>"NO node or noderange specified"};
-        $rsp->{serverdone} = {};
-        if ($sock) {
-            print $sock XMLout($rsp,RootName=>'xcatresponse' ,NoAttr=>1);
-        }
-        return ($rsp);
-
-     }
 
   }
   if (@nodes) { $req->{node} = \@nodes; }