diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 1386b009fc10de66e496ddbdc1eacf14a26fbd1c..f99eb2630a25ffaf2eac66e0c056bee698440378 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -834,12 +834,13 @@ int slurm_send_recv_controller_msg(slurm_msg_t *req, slurm_msg_t *resp)
                         ESLURM_IN_STANDBY_MODE) &&
 	        (req->msg_type != MESSAGE_NODE_REGISTRATION_STATUS) &&
 	        (slurmctld_conf.backup_controller) &&
-                (difftime(time(NULL), start_time) < (slurmctld_conf.slurmctld_timeout +
+                (difftime(time(NULL), start_time) < 
+                        (slurmctld_conf.slurmctld_timeout +
                         slurmctld_conf.heartbeat_interval))) {
 		debug("Neither primary nor backup controller responding, "
 		      "sleep and retry");
 		slurm_free_return_code_msg(resp->data);
-		sleep(5);
+		sleep(30);
 		if ((fd = slurm_open_controller_conn()) < 0) 
                 	return SLURM_SOCKET_ERROR;
 	}