diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 23b2c02a11193e4080cf8ec97fa5b5f370eb27a3..d3f44f4c9a943ea9507855783564810a3ee1a51a 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -496,7 +496,8 @@ static void *_thread_per_node_rpc(void *args)
 	msg.data     = task_ptr->msg_args_ptr;
 
 	if (task_ptr->msg_type == REQUEST_KILL_TIMELIMIT) 
-		timeout = slurmctld_conf.kill_wait;
+		timeout = slurmctld_conf.kill_wait + 2;  /* 2 extra seconds 
+							   for slurmd reply */
 
 	if (slurm_send_recv_rc_msg(&msg, &rc, timeout) < 0) {
 		error("agent: %s: %m", thread_ptr->node_name);