diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index a518d7a2bb5fc2ffb0ca9fc5904d1a034385633f..f722357ae2cab646575b81339369fe39dfbc1821 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -958,7 +958,8 @@ static void
 _rpc_shutdown(slurm_msg_t *msg, slurm_addr *cli_addr)
 {
 	uid_t req_uid = g_slurm_auth_get_uid(msg->auth_cred);
-
+	
+	forward_wait(msg);
 	if (!_slurm_authorized_user(req_uid))
 		error("Security violation, shutdown RPC from uid %u",
 		      (unsigned int) req_uid);
@@ -966,7 +967,6 @@ _rpc_shutdown(slurm_msg_t *msg, slurm_addr *cli_addr)
 		if (kill(conf->pid, SIGTERM) != 0)
 			error("kill(%u,SIGTERM): %m", conf->pid);
 	}
-	forward_wait(msg);
 	
 	/* Never return a message, slurmctld does not expect one */
 }