diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 4a505da91e1c525b337da38557e45354f09802b4..137caefd4bb6522bc0a5032969c640d207281a4f 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1287,7 +1287,6 @@ static void  _slurm_rpc_epilog_complete(slurm_msg_t * msg)
 	if (!validate_slurm_user(uid)) {
 		error("Security violation, EPILOG_COMPLETE RPC from uid=%d",
 		      uid);
-		slurm_send_rc_msg(msg, SLURM_ERROR);
 		return;
 	}
 
@@ -1296,7 +1295,6 @@ static void  _slurm_rpc_epilog_complete(slurm_msg_t * msg)
 				epilog_msg->return_code))
 		run_scheduler = true;
 	unlock_slurmctld(job_write_lock);
-slurm_send_rc_msg(msg, SLURM_SUCCESS);	/* FIXME: Placeholder for now */
 	END_TIMER2("_slurm_rpc_epilog_complete");
 
 	if (epilog_msg->return_code)
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index f6136e54ea87b6b9147bfbcbf0ec670e56dacd91..5d395b1ba527910a47040cf10ccdb6f943955d24 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -2972,11 +2972,10 @@ static int
 _epilog_complete(uint32_t jobid, int rc)
 {
 	int                    ret = SLURM_SUCCESS;
-	slurm_msg_t            msg, resp;
+	slurm_msg_t            msg;
 	epilog_complete_msg_t  req;
 
 	slurm_msg_t_init(&msg);
-	slurm_msg_t_init(&resp);
 
 	req.job_id      = jobid;
 	req.return_code = rc;
@@ -2989,7 +2988,9 @@ _epilog_complete(uint32_t jobid, int rc)
 	msg.msg_type    = MESSAGE_EPILOG_COMPLETE;
 	msg.data        = &req;
 
-	if (slurm_send_recv_controller_msg(&msg, &resp) < 0) {
+	/* Note: No return code to message, slurmctld will resend
+	 * TERMINATE_JOB request if message send fails */
+	if (slurm_send_only_controller_msg(&msg) < 0) {
 		error("Unable to send epilog complete message: %m");
 		ret = SLURM_ERROR;
 	} else {