diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index c77f09fa0..c4bda52cb 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -194,7 +194,6 @@ sub login {
     $self->{onlogon}      = $args{callback};
     $self->{onlogon_args} = $args{callback_args};
     $self->{logontries}   = 5;
-    $self->{nowait} = 1;
     $self->get_channel_auth_cap();
 }
 
@@ -344,7 +343,6 @@ sub admin_level_set {
         $self->{onlogon}->($errtxt, $self->{onlogon_args});
     } else {
         $self->{logged} = 1;
-        $self->{nowait} = 0;
         $self->{onlogon}->("SUCCESS", $self->{onlogon_args});
     }
 }
@@ -1059,7 +1057,7 @@ sub sendpayload {
             #push integrity data
         }
     }
-    unless ($args{nowait} or $self->{nowait}) { #if nowait indicated, the packet will be sent regardless of maxpending
+    unless ($args{nowait} or $self->{nowait} or $self->{neverwait}) { #if nowait indicated, the packet will be sent regardless of maxpending
          #primary use case would be retries that should represent no delta to pending sessions in aggregate and therefore couldn't exceed maxpending anywy
          #if we did do this on timedout, waitforrsp may recurse, which is a complicated issue.  Theoretically, if waitforrsp protected itself, it
          #would act the same, but best be explicit about nowait if practice does not match theory
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 0331f9d84..d86621ada 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -2170,7 +2170,7 @@ sub reseat_node {
 		    data => [ $sessdata->{slotnumber}, 2 ],
 		    callback => \&fpc_node_reseat_complete, callback_args => $sessdata);
 	} else {
-            $sessdata->{fpcipmisession} = xCAT::IPMI->new(bmc => $mpent->{mpa}, userid => $nodeuser, password => $nodepass);
+            $sessdata->{fpcipmisession} = xCAT::IPMI->new(bmc => $mpent->{mpa}, userid => $nodeuser, password => $nodepass, neverwait => 1);
 	    $fpcsessions{$mpent->{mpa}} = $sessdata->{fpcipmisession};
             $sessdata->{fpcipmisession}->login(callback => \&fpc_node_reseat, callback_args => $sessdata);
         }